* string.c (rb_str_scan): add string modification check.

  [ruby-core:7216]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10603 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 7 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 58e6e8c5e..55ee5299e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul 26 16:39:07 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_scan): add string modification check.
+	  [ruby-core:7216]
+
 Wed Jul 26 16:06:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/cgi.rb (CGI::QueryExtension::read_multipart): check
diff --git a/string.c b/string.c
index 62c494ac7..fb8be9dca 100644
--- a/string.c
+++ b/string.c
@@ -4255,6 +4255,7 @@ rb_str_scan(str, pat)
     VALUE result;
     long start = 0;
     VALUE match = Qnil;
+    char *p = RSTRING(str)->ptr; long len = RSTRING(str)->len;
 
     pat = get_pat(pat, 1);
     if (!rb_block_given_p()) {
@@ -4272,6 +4273,7 @@ rb_str_scan(str, pat)
 	match = rb_backref_get();
 	rb_match_busy(match);
 	rb_yield(result);
+	str_mod_check(str, p, len);
 	rb_backref_set(match);	/* restore $~ value */
     }
     rb_backref_set(match);