* 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/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 {