* 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/trunk@7099 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 0 deletions

diff --git a/io.c b/io.c
index 460973ff27..9bdad5496b 100644
--- a/io.c
+++ b/io.c
@@ -1132,11 +1132,13 @@ io_readpartial(argc, argv, io)
 
     READ_CHECK(fptr->f);
     if (RSTRING(str)->len != len) {
+      modified:
 	rb_raise(rb_eRuntimeError, "buffer string modified");
     }
     n = read_buffered_data(RSTRING(str)->ptr, len, fptr->f);
     if (n <= 0) {
       again:
+	if (RSTRING(str)->len != len) goto modified;
         TRAP_BEG;
         n = read(fileno(fptr->f), RSTRING(str)->ptr, len);
         TRAP_END;