From 1d47275b82586e2fb35e230b379a67357d106686 Mon Sep 17 00:00:00 2001 From: jeg2 Date: Tue, 3 Mar 2009 18:43:53 +0000 Subject: * lib/csv.rb: A patch from Madoka Yakamamoto to prevent an infinite loop while reading some encodings. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22743 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/csv.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/csv.rb b/lib/csv.rb index fd83fdc35..774f9c3ef 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 -- cgit