meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-26 18:31:14 +00:00
Code Issues Releases Wiki Activity

\f or \v character in Textile markup may cause RegexpError exception (#29756).

Browse Source 
Patch by Go MAEDA.


git-svn-id: http://svn.redmine.org/redmine/trunk@17603 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2018-10-28 11:01:54 +00:00
parent fce77eb97b
commit e8243d213d
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/redmine/wiki_formatting/textile/redcloth3.rb
View File

@ -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?

6
test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb
View File

@ -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)