diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-08-06 16:01:02 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-08-06 16:01:02 +0000 |
| commit | af6f2cfc167e096bb193614fda22e7ffae0d90d6 (patch) | |
| tree | 03d33582b960b69c6760424a0b44b869e8f9795c | |
| parent | 82fd1b704a0e0129efac03db8e926b568b64293c (diff) | |
| download | ruby-af6f2cfc167e096bb193614fda22e7ffae0d90d6.tar.gz ruby-af6f2cfc167e096bb193614fda22e7ffae0d90d6.tar.xz ruby-af6f2cfc167e096bb193614fda22e7ffae0d90d6.zip | |
* ext/zlib/zlib.c: Zlib::GzipReader#read(0) returns "" instead of nil.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6739 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -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 38ab667cd..0e9d9a679 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); } |