admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix mrb_get_argv() to return array pointer every time; fix #4832

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2019-12-09 20:46:22 +09:00
parent fb9e92e828
commit 694089fafe
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/class.c
+12 -10
View File
@@ -542,15 +542,12 @@ MRB_API mrb_value*
mrb_get_argv(mrb_state *mrb) mrb_get_argv(mrb_state *mrb)
{ {
mrb_int argc = mrb->c->ci->argc; mrb_int argc = mrb->c->ci->argc;
mrb_value *array_argv; mrb_value *array_argv = mrb->c->stack + 1;
if (argc < 0) { if (argc < 0) {
struct RArray *a = mrb_ary_ptr(mrb->c->stack[1]); struct RArray *a = mrb_ary_ptr(*array_argv);
array_argv = ARY_PTR(a); array_argv = ARY_PTR(a);
} }
else {
array_argv = NULL;
}
return array_argv; return array_argv;
} }
@@ -594,9 +591,10 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
char c; char c;
mrb_int i = 0; mrb_int i = 0;
va_list ap; va_list ap;
mrb_int argc = mrb_get_argc(mrb);
mrb_int arg_i = 0; mrb_int arg_i = 0;
mrb_value *array_argv = mrb_get_argv(mrb); mrb_int argc = mrb->c->ci->argc;
mrb_value *array_argv = mrb->c->stack+1;
mrb_bool argv_on_stack = argc >= 0;
mrb_bool opt = FALSE; mrb_bool opt = FALSE;
mrb_bool opt_skip = TRUE; mrb_bool opt_skip = TRUE;
mrb_bool given = TRUE; mrb_bool given = TRUE;
@@ -604,10 +602,14 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
mrb_bool reqkarg = FALSE; mrb_bool reqkarg = FALSE;
mrb_int needargc = 0; mrb_int needargc = 0;
if (!argv_on_stack) {
struct RArray *a = mrb_ary_ptr(*array_argv);
array_argv = ARY_PTR(a);
argc = ARY_LEN(a);
}
va_start(ap, format); va_start(ap, format);
#define ARGV \ #define ARGV array_argv
(array_argv ? array_argv : (mrb->c->stack + 1))
while ((c = *fmt++)) { while ((c = *fmt++)) {
switch (c) { switch (c) {
@@ -931,7 +933,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
{ {
mrb_value **var; mrb_value **var;
mrb_int *pl; mrb_int *pl;
mrb_bool nocopy = altmode || array_argv ? TRUE : FALSE; mrb_bool nocopy = altmode || argv_on_stack ? TRUE : FALSE;
var = va_arg(ap, mrb_value**); var = va_arg(ap, mrb_value**);
pl = va_arg(ap, mrb_int*); pl = va_arg(ap, mrb_int*);