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

Add argv and argc check in OP_ENTER; fix #4102

Browse Source 
`argv` may be retrieved from an array whose `ptr` is `NULL` when it`s
empty.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2018-09-05 07:06:25 +09:00
parent 9b5910bd0f
commit 2a9525caab
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+10 -12
View File
@@ -1791,21 +1791,19 @@ RETRY_TRY_BLOCK:
kargs = 0;
}
else {
if (!mrb_hash_p(argv[argc - 1])) {
if (r) {
kdict = mrb_hash_new(mrb);
kargs = 0;
}
else {
mrb_value str = mrb_str_new_lit(mrb, "Excepcted `Hash` as last argument for keyword arguments");
mrb_exc_set(mrb, mrb_exc_new_str(mrb, E_ARGUMENT_ERROR, str));
goto L_RAISE;
}
if (argv && argc > 0 && mrb_hash_p(argv[argc-1])) {
kdict = argv[argc-1];
mrb_hash_check_kdict(mrb, kdict);
}
else if (r) {
kdict = mrb_hash_new(mrb);
kargs = 0;
}
else {
kdict = argv[argc-1];
mrb_value str = mrb_str_new_lit(mrb, "Excepcted `Hash` as last argument for keyword arguments");
mrb_exc_set(mrb, mrb_exc_new_str(mrb, E_ARGUMENT_ERROR, str));
goto L_RAISE;
}
mrb_hash_check_kdict(mrb, kdict);
if (MRB_ASPEC_KEY(a) > 0) {
kdict = mrb_hash_dup(mrb, kdict);
}