From 86dfbd3c47ce88107922052280c0fb613eda6a54 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 6 May 2008 15:56:21 +0000
Subject: [PATCH] * ext/zlib/zlib.c (gzreader_gets): may cause infinite loop.  
 [ruby-reference-manual:762]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16304 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog       | 5 +++++
 ext/zlib/zlib.c | 2 ++
 version.h       | 6 +++---
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aff6e53454..86685598f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May  7 00:54:25 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/zlib/zlib.c (gzreader_gets): may cause infinite loop.
+	  [ruby-reference-manual:762]
+
 Tue May  6 02:08:18 2008  Tanaka Akira  <akr@fsij.org>
 
 	* test/io/nonblock/test_flush.rb: don't set Thread.abort_on_exception.
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 2546daade5..47e53dceeb 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -3016,6 +3016,8 @@ gzreader_gets(int argc, VALUE *argv, VALUE obj)
     if (NIL_P(rs)) {
 	dst = gzfile_read_all(gz);
 	if (RSTRING_LEN(dst) != 0) gz->lineno++;
+	else
+	    return Qnil;
 	return dst;
     }
 
diff --git a/version.h b/version.h
index c0a1b0043c..73d572e9dd 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-05-06"
+#define RUBY_RELEASE_DATE "2008-05-07"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20080506
+#define RUBY_RELEASE_CODE 20080507
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 6
+#define RUBY_RELEASE_DAY 7
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];