From e8243d213dd14c35f7409f3a13278e985c3ade79 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Sun, 28 Oct 2018 11:01:54 +0000 Subject: [PATCH] \f or \v character in Textile markup may cause RegexpError exception (#29756). Patch by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/trunk@17603 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/wiki_formatting/textile/redcloth3.rb | 2 +- .../lib/redmine/wiki_formatting/textile_formatter_test.rb | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/redmine/wiki_formatting/textile/redcloth3.rb b/lib/redmine/wiki_formatting/textile/redcloth3.rb index 2349a0b84..6ffd7c78c 100644 --- a/lib/redmine/wiki_formatting/textile/redcloth3.rb +++ b/lib/redmine/wiki_formatting/textile/redcloth3.rb @@ -1034,7 +1034,7 @@ class RedCloth3 < String def flush_left( text ) indt = 0 if text =~ /^ / - while text !~ /^ {#{indt}}\S/ + while text !~ /^ {#{indt}}[^ ]/ indt += 1 end unless text.empty? if indt.nonzero? diff --git a/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb b/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb index cc31a4c80..a4c8167d1 100644 --- a/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb +++ b/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb @@ -599,6 +599,12 @@ EXPECTED assert_equal expected.gsub(%r{[\r\n\t]}, ''), to_html(text).gsub(%r{[\r\n\t]}, '') end + # TODO: Remove this test after migrating to RedCloth 4 + def test_should_not_crash_with_special_input + assert_nothing_raised { to_html(" \f") } + assert_nothing_raised { to_html(" \v") } + end + private def assert_html_output(to_test, expect_paragraph = true) -- 2.39.5