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].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17272 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 9 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index b26070c630..451f9d1700 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jun 15 22:41:49 2008  Yukihiro Matsumoto  <[email protected]>
+
+	* 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  <[email protected]>
 
 	Merged 16241 from trunk.
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 4684865c65..53d5a19837 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -3111,6 +3111,8 @@ gzreader_gets(argc, argv, obj)
     if (NIL_P(rs)) {
 	dst = gzfile_read_all(gz);
 	if (RSTRING(dst)->len != 0) gz->lineno++;
+	else
+		return Qnil;
 	return dst;
     }
 
diff --git a/version.h b/version.h
index 09660a5a31..c653eb8950 100644
--- a/version.h
+++ b/version.h
@@ -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