Fixed too much value_copy() when block is not given; fix #3440

The issue was reported by https://hackerone.com/titanous
parent b2387477
...@@ -1151,12 +1151,14 @@ RETRY_TRY_BLOCK: ...@@ -1151,12 +1151,14 @@ RETRY_TRY_BLOCK:
} }
if (GET_OPCODE(i) != OP_SENDB) { if (GET_OPCODE(i) != OP_SENDB) {
SET_NIL_VALUE(regs[bidx]); SET_NIL_VALUE(regs[bidx]);
bidx = 0;
} }
else { else {
mrb_value blk = regs[bidx]; mrb_value blk = regs[bidx];
if (!mrb_nil_p(blk) && mrb_type(blk) != MRB_TT_PROC) { if (!mrb_nil_p(blk) && mrb_type(blk) != MRB_TT_PROC) {
regs[bidx] = mrb_convert_type(mrb, blk, MRB_TT_PROC, "Proc", "to_proc"); regs[bidx] = mrb_convert_type(mrb, blk, MRB_TT_PROC, "Proc", "to_proc");
} }
bidx = 1;
} }
c = mrb_class(mrb, recv); c = mrb_class(mrb, recv);
m = mrb_method_search_vm(mrb, &c, mid); m = mrb_method_search_vm(mrb, &c, mid);
...@@ -1177,15 +1179,17 @@ RETRY_TRY_BLOCK: ...@@ -1177,15 +1179,17 @@ RETRY_TRY_BLOCK:
mrb_method_missing(mrb, mid, recv, args); mrb_method_missing(mrb, mid, recv, args);
} }
mid = missing; mid = missing;
if (n == CALL_MAXARGS-1) {
regs[a+1] = mrb_ary_new_from_values(mrb, n, regs+a+1);
n++;
}
if (n == CALL_MAXARGS) { if (n == CALL_MAXARGS) {
mrb_ary_unshift(mrb, regs[a+1], sym); mrb_ary_unshift(mrb, regs[a+1], sym);
} }
else { else {
value_move(regs+a+2, regs+a+1, ++n); value_move(regs+a+2, regs+a+1, n+bidx);
regs[a+1] = sym; regs[a+1] = sym;
if (n == CALL_MAXARGS) { n++;
regs[a+1] = mrb_ary_new_from_values(mrb, n, regs+a+1);
}
} }
} }
...@@ -1355,6 +1359,10 @@ RETRY_TRY_BLOCK: ...@@ -1355,6 +1359,10 @@ RETRY_TRY_BLOCK:
mrb_method_missing(mrb, mid, recv, args); mrb_method_missing(mrb, mid, recv, args);
} }
mid = missing; mid = missing;
if (n == CALL_MAXARGS-1) {
regs[a+1] = mrb_ary_new_from_values(mrb, n, regs+a+1);
n++;
}
if (n == CALL_MAXARGS) { if (n == CALL_MAXARGS) {
mrb_ary_unshift(mrb, regs[a+1], mrb_symbol_value(ci->mid)); mrb_ary_unshift(mrb, regs[a+1], mrb_symbol_value(ci->mid));
} }
......
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