save/restore arena index around yield; ref #3359

parent 6af8cc36
...@@ -315,7 +315,7 @@ mrb_str_lines(mrb_state *mrb, mrb_value self) ...@@ -315,7 +315,7 @@ mrb_str_lines(mrb_state *mrb, mrb_value self)
mrb_get_args(mrb, "&", &blk); mrb_get_args(mrb, "&", &blk);
result = mrb_ary_new(mrb); result = mrb_ary_new(mrb);
ai = mrb_gc_arena_save(mrb);
if (!mrb_nil_p(blk)) { if (!mrb_nil_p(blk)) {
while (p < e) { while (p < e) {
t = p; t = p;
...@@ -324,6 +324,7 @@ mrb_str_lines(mrb_state *mrb, mrb_value self) ...@@ -324,6 +324,7 @@ mrb_str_lines(mrb_state *mrb, mrb_value self)
len = (mrb_int) (p - t); len = (mrb_int) (p - t);
arg = mrb_str_new(mrb, t, len); arg = mrb_str_new(mrb, t, len);
mrb_yield_argv(mrb, blk, 1, &arg); mrb_yield_argv(mrb, blk, 1, &arg);
mrb_gc_arena_restore(mrb, ai);
if (b != RSTRING_PTR(self)) { if (b != RSTRING_PTR(self)) {
ptrdiff_t diff = p - b; ptrdiff_t diff = p - b;
b = RSTRING_PTR(self); b = RSTRING_PTR(self);
...@@ -334,7 +335,6 @@ mrb_str_lines(mrb_state *mrb, mrb_value self) ...@@ -334,7 +335,6 @@ mrb_str_lines(mrb_state *mrb, mrb_value self)
return self; return self;
} }
while (p < e) { while (p < e) {
ai = mrb_gc_arena_save(mrb);
t = p; t = p;
while (p < e && *p != '\n') p++; while (p < e && *p != '\n') p++;
if (*p == '\n') p++; if (*p == '\n') p++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment