matz	2008-05-07 00:58:23 +0900 (Wed, 07 May 2008)

  New Revision: 16305

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

  Log:
    * 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/ChangeLog?r1=16305&r2=16304&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ext/zlib/zlib.c?r1=16305&r2=16304&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/version.h?r1=16305&r2=16304&diff_format=u

Index: ruby_1_8/ext/zlib/zlib.c
===================================================================
--- ruby_1_8/ext/zlib/zlib.c	(revision 16304)
+++ ruby_1_8/ext/zlib/zlib.c	(revision 16305)
@@ -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/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 16304)
+++ ruby_1_8/ChangeLog	(revision 16305)
@@ -1,3 +1,9 @@
+Wed May  7 00:54:25 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 May  4 09:35:51 2008  Masatoshi SEKI  <m_seki@m...>
 
 	* sample/erb/erb4html.rb (ERB4Html) : add example of ERB#set_eoutvar.
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 16304)
+++ ruby_1_8/version.h	(revision 16305)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-05-02"
+#define RUBY_RELEASE_DATE "2008-05-07"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20080502
+#define RUBY_RELEASE_CODE 20080507
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 2
+#define RUBY_RELEASE_DAY 7
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

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