shyouhei	2008-06-15 22:42:34 +0900 (Sun, 15 Jun 2008)

  New Revision: 17272

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/ext/zlib/zlib.c
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 16305:
    * ext/zlib/zlib.c (gzreader_gets): may cause infinite loop.
      a patch from Kouya <kouyataifu4 at gmail.com> in
      [ruby-reference-manual:762].


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ext/zlib/zlib.c?r1=17272&r2=17271&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17272&r2=17271&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17272&r2=17271&diff_format=u

Index: ruby_1_8_5/ext/zlib/zlib.c
===================================================================
--- ruby_1_8_5/ext/zlib/zlib.c	(revision 17271)
+++ ruby_1_8_5/ext/zlib/zlib.c	(revision 17272)
@@ -3111,6 +3111,8 @@
     if (NIL_P(rs)) {
 	dst = gzfile_read_all(gz);
 	if (RSTRING(dst)->len != 0) gz->lineno++;
+	else
+		return Qnil;
 	return dst;
     }
 
Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 17271)
+++ ruby_1_8_5/ChangeLog	(revision 17272)
@@ -1,3 +1,9 @@
+Sun Jun 15 22:41:49 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* ext/zlib/zlib.c (gzreader_gets): may cause infinite loop.
+	  a patch from Kouya <kouyataifu4 at gmail.com> in
+	  [ruby-reference-manual:762].
+
 Sun Jun 15 22:32:39 2008  James Edward Gray II  <jeg2@r...>
 
 	Merged 16241 from trunk.
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 17271)
+++ ruby_1_8_5/version.h	(revision 17272)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-15"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080615
-#define RUBY_PATCHLEVEL 201
+#define RUBY_PATCHLEVEL 202
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

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