2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index bd8dfc7ec..1f62a8833 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
+
 Mon Mar  2 21:01:36 2009  Tanaka Akira  <akr@fsij.org>
 
 	* file.c: include fcntl.h for O_RDONLY on Solaris.
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