diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | ext/zlib/zlib.c | 5 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Sat Aug 7 00:50:01 2004 Tanaka Akira <akr@m17n.org> + + * ext/zlib/zlib.c: Zlib::GzipReader#read(0) returns "" instead of nil. + Mon Aug 3 13:49:20 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> * ext/tk/lib/tk/namespace.rb: bug fix diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 38ab667cd4..0e9d9a679a 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -2072,7 +2072,10 @@ gzfile_read(gz, len) { VALUE dst; - if (len <= 0) return Qnil; + if (len < 0) + rb_raise(rb_eArgError, "negative length %d given", len); + if (len == 0) + return rb_str_new(0, 0); while (!ZSTREAM_IS_FINISHED(&gz->z) && gz->z.buf_filled < len) { gzfile_read_more(gz); } |