* parse.y (lex_getline): should not touch ruby_debug_lines if

  RIPPER is defined.  [ruby-dev:24547]

* string.c (str_gsub): 	reentrant check.  [ruby-dev:24432]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7091 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 0 deletions

diff --git a/io.c b/io.c
index 88fdd8ae81..2dc89cbeb9 100644
--- a/io.c
+++ b/io.c
@@ -1131,6 +1131,9 @@ io_readpartial(argc, argv, io)
 	return str;
 
     READ_CHECK(fptr->f);
+    if (RSTRING(str)->len != len) {
+	rb_raise(rb_eRuntimeError, "buffer string modified");
+    }
     n = read_buffered_data(RSTRING(str)->ptr, len, fptr->f);
     if (n <= 0) {
       again: