* lib/csv.rb: A patch from Madoka Yakamamoto to prevent an infinite

loop while reading some encodings.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22743 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
jeg2 2009-03-03 18:43:53 +00:00
parent 5371f5cb26
commit 111c48e611
2 changed files with 6 additions and 3 deletions

View File

@ -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.

View File

@ -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