diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-08 07:19:30 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-08 07:19:30 +0000 |
| commit | dd8710d243f756ea446ae6f92f72c9e41755fd77 (patch) | |
| tree | 88eacf942f0045896a9eff5d49139b5815df01cc /vm_insnhelper.c | |
| parent | 72f60a2ff1900295b1ff8d10b63b045152475d4f (diff) | |
class.c, vm_insnhelper.c: check unknown keywords
* class.c (rb_get_kwargs): if optional is negative, unknown
keywords are allowed.
* vm_insnhelper.c (vm_callee_setup_keyword_arg): check unknown
keywords.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44069 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 28d0ea31c6..d490f4690e 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1067,7 +1067,8 @@ vm_caller_setup_args(const rb_thread_t *th, rb_control_frame_t *cfp, rb_call_inf static inline int vm_callee_setup_keyword_arg(const rb_iseq_t *iseq, int argc, int m, VALUE *orig_argv, VALUE *kwd) { - VALUE keyword_hash, orig_hash; + VALUE keyword_hash = 0, orig_hash; + int optional = iseq->arg_keywords - iseq->arg_keyword_required; if (argc > m && !NIL_P(orig_hash = rb_check_hash_type(orig_argv[argc-1])) && @@ -1078,14 +1079,11 @@ vm_callee_setup_keyword_arg(const rb_iseq_t *iseq, int argc, int m, VALUE *orig_ else { orig_argv[argc-1] = orig_hash; } - rb_get_kwargs(keyword_hash, iseq->arg_keyword_table, iseq->arg_keyword_required, - iseq->arg_keyword_check ? iseq->arg_keywords - iseq->arg_keyword_required : 0, - NULL); } - else if (iseq->arg_keyword_required) { - rb_get_kwargs(0, iseq->arg_keyword_table, iseq->arg_keyword_required, 0, NULL); - } - else { + rb_get_kwargs(keyword_hash, iseq->arg_keyword_table, iseq->arg_keyword_required, + (iseq->arg_keyword_check ? optional : -1-optional), + NULL); + if (!keyword_hash) { keyword_hash = rb_hash_new(); } |