diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | eval.c | 3 | ||||
| -rw-r--r-- | ext/zlib/zlib.c | 6 |
3 files changed, 21 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Fri Oct 22 00:22:31 2004 Yukihiro Matsumoto <matz@ruby-lang.org> + + * ext/zlib/zlib.c (zstream_shift_buffer): should restore class + field of a buffer. [ruby-dev:24562] + Fri Oct 22 00:20:33 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> * string.c (rb_str_include): should not treat char as negative value. @@ -8,6 +13,14 @@ Thu Oct 21 19:06:15 2004 GOTOU Yuuzou <gotoyuzo@notwork.org> * lib/webrick/httpresponse.rb (WEBrick::HTTPResponse#send_body_io): ensure to close @body. (http://bugs.debian.org/277520) +Thu Oct 21 00:36:41 2004 Yukihiro Matsumoto <matz@ruby-lang.org> + + * 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] + Wed Oct 20 19:45:13 2004 Yukihiro Matsumoto <matz@ruby-lang.org> * string.c (str_gsub): reentrant check. [ruby-dev:24432] @@ -2009,6 +2009,9 @@ rb_alias(klass, name, def) if (FL_TEST(klass, FL_SINGLETON)) { singleton = rb_iv_get(klass, "__attached__"); } + if (RTEST(ruby_verbose) && klass == origin && orig->nd_cnt == 0 && orig->nd_body) { + rb_warning("discarding old %s", rb_id2name(name)); + } body = orig->nd_body; orig->nd_cnt++; if (nd_type(body) == NODE_FBODY) { /* was alias */ 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); |