merges r22743 from trunk into ruby_1_9_1.

--
* 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/branches/ruby_1_9_1@22762 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 3 deletions

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