1 files changed, 7 insertions, 4 deletions

diff --git a/string.c b/string.c
index d123207fd..3949a6e33 100644
--- a/string.c
+++ b/string.c
@@ -5689,7 +5689,7 @@ rb_str_scan(VALUE str, VALUE pat)
 {
     VALUE result;
     long start = 0;
-    VALUE match = Qnil;
+    long last = -1, prev = 0;
     char *p = RSTRING_PTR(str); long len = RSTRING_LEN(str);
 
     pat = get_pat(pat, 1);
@@ -5697,18 +5697,21 @@ rb_str_scan(VALUE str, VALUE pat)
 	VALUE ary = rb_ary_new();
 
 	while (!NIL_P(result = scan_once(str, pat, &start))) {
-	    match = rb_backref_get();
+	    last = prev;
+	    prev = start;
 	    rb_ary_push(ary, result);
 	}
-	rb_backref_set(match);
+	if (last >= 0) rb_reg_search(pat, str, last, 0);
 	return ary;
     }
 
     while (!NIL_P(result = scan_once(str, pat, &start))) {
+	last = prev;
+	prev = start;
 	rb_yield(result);
 	str_mod_check(str, p, len);
     }
-    rb_backref_set(match);
+    if (last >= 0) rb_reg_search(pat, str, last, 0);
     return str;
 }