diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 13:42:34 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 13:42:34 +0000 |
commit | 2b24ed556f43668d91a162b752a65f211e57559c (patch) | |
tree | 278bfb6c88294f977e8d08e0aa698b83b274697c /ext/zlib | |
parent | 485521dfb11fae64081679e10db0e7523e32591b (diff) |
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
Diffstat (limited to 'ext/zlib')
-rw-r--r-- | ext/zlib/zlib.c | 2 |
1 files changed, 2 insertions, 0 deletions
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; } |