summaryrefslogtreecommitdiff
path: root/string.c
diff options
context:
space:
mode:
Diffstat (limited to 'string.c')
-rw-r--r--string.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/string.c b/string.c
index 1d1cd2fb06..0caea99096 100644
--- a/string.c
+++ b/string.c
@@ -7949,9 +7949,13 @@ rb_str_split_m(int argc, VALUE *argv, VALUE str)
long idx;
int last_null = 0;
struct re_registers *regs;
+ VALUE match = 0;
- while ((end = rb_reg_search(spat, str, start, 0)) >= 0) {
- regs = RMATCH_REGS(rb_backref_get());
+ for (; (end = rb_reg_search(spat, str, start, 0)) >= 0;
+ (match ? (rb_match_unbusy(match), rb_backref_set(match)) : (void)0)) {
+ match = rb_backref_get();
+ if (!result) rb_match_busy(match);
+ regs = RMATCH_REGS(match);
if (start == end && BEG(0) == END(0)) {
if (!ptr) {
SPLIT_STR(0, 0);
@@ -7982,6 +7986,7 @@ rb_str_split_m(int argc, VALUE *argv, VALUE str)
}
if (!NIL_P(limit) && lim <= ++i) break;
}
+ if (match) rb_match_unbusy(match);
}
if (RSTRING_LEN(str) > 0 && (!NIL_P(limit) || RSTRING_LEN(str) > beg || lim < 0)) {
SPLIT_STR(beg, RSTRING_LEN(str)-beg);