summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-12 09:01:28 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-12 09:01:28 (GMT)
commit77f3125567adc54b8a5534c2c1ded5a19100e8d5 (patch)
treec7da988289c6d95d798eec182fad806c622935e1 /lib
parenta11e25432bf68d87528537b0717f6f13519622eb (diff)
rdoc/text.rb: fix infinite loop
* lib/rdoc/text.rb (expand_tabs): get rid of infinite loop with CR. should check if substitution occurred too. [ruby-dev:48813] [Bug #10732] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49223 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/rdoc/text.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/rdoc/text.rb b/lib/rdoc/text.rb
index 3a58641..606f15e 100644
--- a/lib/rdoc/text.rb
+++ b/lib/rdoc/text.rb
@@ -68,11 +68,11 @@ module RDoc::Text
expanded = []
text.each_line do |line|
- line.gsub!(/^((?:.{8})*?)([^\t\r\n]{0,7})\t/) do
+ nil while line.gsub!(/(?:\G|\r)((?:.{8})*?)([^\t\r\n]{0,7})\t/) do
r = "#{$1}#{$2}#{' ' * (8 - $2.size)}"
r.force_encoding text.encoding if Object.const_defined? :Encoding
r
- end until line !~ /\t/
+ end
expanded << line
end