yugui	2009-03-04 18:21:29 +0900 (Wed, 04 Mar 2009)

  New Revision: 22762

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22762

  Log:
    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.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/lib/csv.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 22761)
+++ ruby_1_9_1/ChangeLog	(revision 22762)
@@ -1,3 +1,8 @@
+Wed Mar  4 03:42:56 2009  James Edward Gray II  <jeg2@r...>
+
+	* 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@f...>
 
 	* file.c: include fcntl.h for O_RDONLY on Solaris.
Index: ruby_1_9_1/lib/csv.rb
===================================================================
--- ruby_1_9_1/lib/csv.rb	(revision 22761)
+++ ruby_1_9_1/lib/csv.rb	(revision 22762)
@@ -2282,9 +2282,7 @@
       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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/