diff options
| -rw-r--r-- | ext/zlib/zlib.c | 9 | ||||
| -rw-r--r-- | test/zlib/test_zlib.rb | 10 |
2 files changed, 8 insertions, 11 deletions
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 956ff08b53..232ad0b13b 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -879,9 +879,8 @@ zstream_discard_input(struct zstream *z, long len) z->input = Qnil; } else { - memmove(RSTRING_PTR(z->input), RSTRING_PTR(z->input) + len, - RSTRING_LEN(z->input) - len); - rb_str_resize(z->input, RSTRING_LEN(z->input) - len); + z->input = rb_str_substr(z->input, len, + RSTRING_LEN(z->input) - len); } } @@ -2406,9 +2405,7 @@ gzfile_read_raw_ensure(struct gzfile *gz, long size) VALUE str; if (gz->io == Qundef) { /* Zlib.gunzip */ - if (NIL_P(gz->z.input)) - rb_bug("unexpected condition: both gz->io and gz->z.input are nil"); - if (RSTRING_LEN(gz->z.input) < size) + if (NIL_P(gz->z.input) || RSTRING_LEN(gz->z.input) < size) rb_raise(cGzError, "unexpected end of string"); } while (NIL_P(gz->z.input) || RSTRING_LEN(gz->z.input) < size) { diff --git a/test/zlib/test_zlib.rb b/test/zlib/test_zlib.rb index 60fb84dd0d..7f9ec981fd 100644 --- a/test/zlib/test_zlib.rb +++ b/test/zlib/test_zlib.rb @@ -1128,25 +1128,25 @@ if defined? Zlib end def test_gzip - actual = Zlib.gzip("foo") + actual = Zlib.gzip("foo".freeze) actual[4, 4] = "\x00\x00\x00\x00" # replace mtime actual[9] = "\xff" # replace OS expected = %w[1f8b08000000000000ff4bcbcf07002165738c03000000].pack("H*") assert_equal expected, actual - actual = Zlib.gzip("foo", 0) + actual = Zlib.gzip("foo".freeze, 0) actual[4, 4] = "\x00\x00\x00\x00" # replace mtime actual[9] = "\xff" # replace OS expected = %w[1f8b08000000000000ff010300fcff666f6f2165738c03000000].pack("H*") assert_equal expected, actual - actual = Zlib.gzip("foo", 9) + actual = Zlib.gzip("foo".freeze, 9) actual[4, 4] = "\x00\x00\x00\x00" # replace mtime actual[9] = "\xff" # replace OS expected = %w[1f8b08000000000002ff4bcbcf07002165738c03000000].pack("H*") assert_equal expected, actual - actual = Zlib.gzip("foo", 9, Zlib::FILTERED) + actual = Zlib.gzip("foo".freeze, 9, Zlib::FILTERED) actual[4, 4] = "\x00\x00\x00\x00" # replace mtime actual[9] = "\xff" # replace OS expected = %w[1f8b08000000000002ff4bcbcf07002165738c03000000].pack("H*") @@ -1155,7 +1155,7 @@ if defined? Zlib def test_gunzip src = %w[1f8b08000000000000034bcbcf07002165738c03000000].pack("H*") - assert_equal 'foo', Zlib.gunzip(src) + assert_equal 'foo', Zlib.gunzip(src.freeze) src = %w[1f8b08000000000000034bcbcf07002165738c03000001].pack("H*") assert_raise(Zlib::GzipFile::LengthError){ Zlib.gunzip(src) } |