From f46230752807801b1c506f739227bc5daf42ff8c Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sun, 15 Jun 2008 13:43:11 +0000 Subject: merge revision(s) 16305: * ext/zlib/zlib.c (gzreader_gets): may cause infinite loop. a patch from Kouya in [ruby-reference-manual:762]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17274 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ ext/zlib/zlib.c | 2 ++ version.h | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d98e7b1f30..acd320d694 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Jun 15 22:42:54 2008 Yukihiro Matsumoto + + * ext/zlib/zlib.c (gzreader_gets): may cause infinite loop. + a patch from Kouya in + [ruby-reference-manual:762]. + Sun Jun 15 22:34:09 2008 James Edward Gray II Merged 16241 from trunk. diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 8caadaeddc..1b89553772 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 3709ea51f2..aab17a1f86 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-15" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080615 -#define RUBY_PATCHLEVEL 202 +#define RUBY_PATCHLEVEL 203 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3