diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/csv.rb | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Wed Mar 4 03:42:56 2009 James Edward Gray II <jeg2@ruby-lang.org> + + * lib/csv.rb: A patch from Madoka Yakamamoto to prevent an infinite + loop while reading some encodings. + Wed Mar 4 00:54:43 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp> * lib/prime.rb (Prime::prime?): used to return a wrong answer. diff --git a/lib/csv.rb b/lib/csv.rb index fd83fdc354..774f9c3ef3 100644 --- a/lib/csv.rb +++ b/lib/csv.rb @@ -2282,9 +2282,7 @@ class CSV if @io.eof? or data.size >= bytes + 10 return data else - data += @io.read(1) until data.valid_encoding? or - @io.eof? or - data.size >= bytes + 10 + data += @io.read(1) retry end end |