diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-04 15:44:57 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-04 15:44:57 +0000 |
| commit | cc94db60ba2d21d8371a4bb6a00580c4ba99f544 (patch) | |
| tree | a675497cc43022f4cea560157413dabcc2a19b5b /ext | |
| parent | 21538b219e21e9e20b60375dedbe839365526672 (diff) | |
merge revision(s) 41014: [Backport #8467]
* ext/zlib/zlib.c (gzfile_read, gzfile_read_all, gzfile_getc),
(gzreader_gets): check EOF. [ruby-core:55220] [Bug #8467]
* ext/zlib/zlib.c (gzfile_read, gzfile_read_all, gzfile_getc),
(gzreader_gets): check EOF. [ruby-core:55220] [Bug #8467]
* lib/cgi/util.rb: All class methods moduleized.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41073 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/zlib/zlib.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 170d306162..69fd6769fa 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -2707,7 +2707,7 @@ gzfile_read(struct gzfile *gz, long len) if (len == 0) return rb_str_new(0, 0); if (len < 0) return Qnil; dst = zstream_shift_buffer(&gz->z, len); - gzfile_calc_crc(gz, dst); + if (!NIL_P(dst)) gzfile_calc_crc(gz, dst); return dst; } @@ -2770,6 +2770,7 @@ gzfile_read_all(struct gzfile *gz) } dst = zstream_detach_buffer(&gz->z); + if (NIL_P(dst)) return dst; gzfile_calc_crc(gz, dst); OBJ_TAINT(dst); return gzfile_newstr(gz, dst); @@ -2816,6 +2817,7 @@ gzfile_getc(struct gzfile *gz) buf = gz->z.buf; len = rb_enc_mbclen(RSTRING_PTR(buf), RSTRING_END(buf), gz->enc); dst = gzfile_read(gz, len); + if (NIL_P(dst)) return dst; return gzfile_newstr(gz, dst); } } @@ -4041,6 +4043,7 @@ gzreader_gets(int argc, VALUE *argv, VALUE obj) n = limit; } dst = zstream_shift_buffer(&gz->z, n); + if (NIL_P(dst)) return dst; gzfile_calc_crc(gz, dst); dst = gzfile_newstr(gz, dst); } @@ -4102,6 +4105,7 @@ gzreader_gets(int argc, VALUE *argv, VALUE obj) gz->lineno++; dst = gzfile_read(gz, n); + if (NIL_P(dst)) return dst; if (rspara) { gzreader_skip_linebreaks(gz); } |