From 2b24ed556f43668d91a162b752a65f211e57559c Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 15 Jun 2008 13:42:34 +0000
Subject: 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
---
 ext/zlib/zlib.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'ext/zlib/zlib.c')

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;
     }
 
-- 
cgit v1.2.3