summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-07-30 18:28:01 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-07-30 18:28:01 +0000
commit3197814c623f3541bb8b66c11af70eeedbfbee52 (patch)
tree4b519a5b277536114abb05c3971ec31713cec025 /lib
parentb91bdf8798360aa913ac97167c4925f95faa3673 (diff)
downloadredmine-3197814c623f3541bb8b66c11af70eeedbfbee52.tar.gz
redmine-3197814c623f3541bb8b66c11af70eeedbfbee52.zip
Fixed: RedCloth#block_markdown_rule freezes when parsing many hyphen marks (#1704).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1710 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
-rw-r--r--lib/redcloth.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redcloth.rb b/lib/redcloth.rb
index 59d02fbab..df19de22d 100644
--- a/lib/redcloth.rb
+++ b/lib/redcloth.rb
@@ -744,7 +744,7 @@ class RedCloth < String
end
MARKDOWN_RULE_RE = /^(#{
- ['*', '-', '_'].collect { |ch| '( ?' + Regexp::quote( ch ) + ' ?){3,}' }.join( '|' )
+ ['*', '-', '_'].collect { |ch| ' ?(' + Regexp::quote( ch ) + ' ?){3,}' }.join( '|' )
})$/
def block_markdown_rule( text )