Merged r17603 from trunk to 3.4-stable (#29756).

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17604 e93f8b46-1217-0410-a6f0-8f06a7374b81

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?

test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb

@@ -580,6 +580,12 @@ STR
     }, false)
   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)