diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | lib/rdoc/text.rb | 4 | ||||
-rw-r--r-- | test/rdoc/test_rdoc_text.rb | 3 | ||||
-rw-r--r-- | version.h | 6 |
4 files changed, 14 insertions, 5 deletions
@@ -1,3 +1,9 @@ +Mon Jan 19 11:44:52 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/rdoc/text.rb (expand_tabs): get rid of infinite loop with + CR. should check if substitution occurred too. + [ruby-dev:48813] [Bug #10732] + Sun Jan 18 00:59:41 2015 Eric Wong <e@80x24.org> * numeric.c (bit_coerce): use original value for error message diff --git a/lib/rdoc/text.rb b/lib/rdoc/text.rb index 3a58641ec1..606f15eb0e 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 diff --git a/test/rdoc/test_rdoc_text.rb b/test/rdoc/test_rdoc_text.rb index b0c464a659..a69989d15d 100644 --- a/test/rdoc/test_rdoc_text.rb +++ b/test/rdoc/test_rdoc_text.rb @@ -56,6 +56,9 @@ class TestRDocText < RDoc::TestCase assert_equal('. .', expand_tabs(".\t\t."), 'dot tab tab dot') + + assert_equal('a a', + Timeout.timeout(1) {expand_tabs("\ra\ta")}, "carriage return") end def test_expand_tabs_encoding @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.2.0" -#define RUBY_RELEASE_DATE "2015-01-18" -#define RUBY_PATCHLEVEL 27 +#define RUBY_RELEASE_DATE "2015-01-19" +#define RUBY_PATCHLEVEL 28 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 18 +#define RUBY_RELEASE_DAY 19 #include "ruby/version.h" |