diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-21 15:27:25 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-21 15:27:25 +0000 |
commit | 6dea159d035a2f0252b9b9f6f43c703ebcd2fdc4 (patch) | |
tree | 28c82ccdcc17011f12a4a4d78671fc5c3bea29e8 /ext | |
parent | 4e7b5c8895b36556e939855c1a0880137c958532 (diff) |
* ext/zlib/zlib.c (zstream_shift_buffer): should restore class
field of a buffer. [ruby-dev:24562]
* eval.c (rb_alias): should warn on method discarding.
[ruby-dev:24546]
* ext/zlib/zlib.c (zstream_expand_buffer_into): hide internal
string buffer by clearing klass. [ruby-dev:24548]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7098 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 0afd7e0152..f44a4ee209 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -469,6 +469,7 @@ zstream_expand_buffer_into(z, size) z->buf_filled = 0; z->stream.next_out = RSTRING(z->buf)->ptr; z->stream.avail_out = size; + RBASIC(z->buf)->klass = 0; } else if (z->stream.avail_out != size) { rb_str_resize(z->buf, z->buf_filled + size); @@ -489,6 +490,7 @@ zstream_append_buffer(z, src, len) z->buf_filled = len; z->stream.next_out = RSTRING(z->buf)->ptr; z->stream.avail_out = 0; + RBASIC(z->buf)->klass = 0; return; } @@ -524,13 +526,14 @@ zstream_detach_buffer(z) else { dst = z->buf; rb_str_resize(dst, z->buf_filled); + RBASIC(dst)->klass = rb_cString; + RBASIC(dst)->klass = rb_cString; } z->buf = Qnil; z->buf_filled = 0; z->stream.next_out = 0; z->stream.avail_out = 0; - RBASIC(dst)->klass = rb_cString; return dst; } @@ -546,6 +549,7 @@ zstream_shift_buffer(z, len) } dst = rb_str_substr(z->buf, 0, len); + RBASIC(dst)->klass = rb_cString; z->buf_filled -= len; memmove(RSTRING(z->buf)->ptr, RSTRING(z->buf)->ptr + len, z->buf_filled); |