From 0bd639dcb4b546b6bb22be26b35fa58659f3e67a Mon Sep 17 00:00:00 2001 From: matz Date: Thu, 21 Oct 2004 16:13:32 +0000 Subject: * 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: http://svn.ruby-lang.org/repos/ruby/trunk@7099 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/zlib/zlib.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'ext') diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index f5fe2e3fa..aed2a2613 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -471,6 +471,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); @@ -491,6 +492,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; } @@ -526,13 +528,13 @@ zstream_detach_buffer(z) else { dst = z->buf; rb_str_resize(dst, z->buf_filled); + 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; } @@ -548,6 +550,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); -- cgit