diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2016-11-25 09:27:32 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2016-11-25 09:27:32 +0900 |
| commit | 7f05ba86f2dee182bde6d6f2f1840f1edd030a37 (patch) | |
| tree | 0ed6f168be786b68bb0b7713c706ca8be50d742c /mrbgems/mruby-compiler/core/codegen.c | |
| parent | 9f7701e27a136b033cdc1b3fd05ee9898e1ea802 (diff) | |
| parent | 30f12ba4bcfaf7dd4d0a02cb64c664fea804cf7d (diff) | |
| download | mruby-7f05ba86f2dee182bde6d6f2f1840f1edd030a37.tar.gz mruby-7f05ba86f2dee182bde6d6f2f1840f1edd030a37.zip | |
Merge branch 'bouk-127-segfaults'
Diffstat (limited to 'mrbgems/mruby-compiler/core/codegen.c')
| -rw-r--r-- | mrbgems/mruby-compiler/core/codegen.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mrbgems/mruby-compiler/core/codegen.c b/mrbgems/mruby-compiler/core/codegen.c index 8de15aee3..25db887a0 100644 --- a/mrbgems/mruby-compiler/core/codegen.c +++ b/mrbgems/mruby-compiler/core/codegen.c @@ -772,6 +772,8 @@ attrsym(codegen_scope *s, mrb_sym a) return mrb_intern(s->mrb, name2, len+1); } +#define CALL_MAXARGS 127 + static int gen_values(codegen_scope *s, node *t, int val) { @@ -780,7 +782,9 @@ gen_values(codegen_scope *s, node *t, int val) while (t) { is_splat = (intptr_t)t->car->car == NODE_SPLAT; /* splat mode */ - if (n >= 127 || is_splat) { + if ( + n >= CALL_MAXARGS - 1 /* need to subtract one because vm.c expects an array if n == CALL_MAXARGS */ + || is_splat) { if (val) { if (is_splat && n == 0 && (intptr_t)t->car->cdr->car == NODE_ARRAY) { codegen(s, t->car->cdr, VAL); @@ -831,8 +835,6 @@ gen_values(codegen_scope *s, node *t, int val) return n; } -#define CALL_MAXARGS 127 - static void gen_call(codegen_scope *s, node *tree, mrb_sym name, int sp, int val, int safe) { |