diff --git a/ChangeLog b/ChangeLog
index 204d669dc1..19031b37f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Thu Oct 21 00:36:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (lex_getline): should not touch ruby_debug_lines if
+	  RIPPER is defined.  [ruby-dev:24547]
+
+Wed Oct 20 19:45:13 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (str_gsub): 	reentrant check.  [ruby-dev:24432]
+
 Wed Oct 20 12:42:53 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (rb_io_getline): rs modification check should not interfere
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:
diff --git a/parse.y b/parse.y
index 8da26bea1e..d18c59b06b 100644
--- a/parse.y
+++ b/parse.y
@@ -4404,9 +4404,11 @@ lex_getline(parser)
     struct parser_params *parser;
 {
     VALUE line = (*parser->parser_lex_gets)(parser, parser->parser_lex_input);
+#ifndef RIPPER
     if (ruby_debug_lines && !NIL_P(line)) {
 	rb_ary_push(ruby_debug_lines, line);
     }
+#endif
     return line;
 }
 
diff --git a/string.c b/string.c
index af2354708e..e2f7fab1e6 100644
--- a/string.c
+++ b/string.c
@@ -2048,6 +2048,9 @@ str_gsub(argc, argv, str, bang)
 	if (iter) {
 	    rb_match_busy(match);
 	    val = rb_obj_as_string(rb_yield(rb_reg_nth_match(0, match)));
+	    if (RSTRING(str)->ptr == buf) {
+		rb_raise(rb_eRuntimeError, "gsub reentered");
+	    }
 	    rb_backref_set(match);
 	}
 	else {