diff options
author | ktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-09-29 09:50:24 +0000 |
---|---|---|
committer | ktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-09-29 09:50:24 +0000 |
commit | 94f5787130bea9223ddb93b87f50ed5491276719 (patch) | |
tree | 7e89ecab9a9ac4cb452c1d3f76972a6a945fba09 /vm_insnhelper.c | |
parent | 202cc8e615975d67659d517bac04b8697c34c2f0 (diff) | |
download | ruby-94f5787130bea9223ddb93b87f50ed5491276719.tar.gz |
* vm_insnhelper.c (vm_callee_setup_arg_complex, vm_yield_setup_block_args):
clear keyword arguments to prevent GC bug which occurs
while marking VM stack.
[ruby-dev:47729] [Bug #8964]
* test/ruby/test_keyword.rb: tests for the above.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43081 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
-rw-r--r-- | vm_insnhelper.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 96b624d014..d82cec1858 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1226,6 +1226,11 @@ vm_callee_setup_arg_complex(rb_thread_t *th, rb_call_info_t *ci, const rb_iseq_t /* keyword argument */ if (iseq->arg_keyword != -1) { + int i; + int arg_keywords_end = iseq->arg_keyword - (iseq->arg_block != -1); + for (i = iseq->arg_keywords; 0 < i; i--) { + orig_argv[arg_keywords_end - i] = Qnil; + } orig_argv[iseq->arg_keyword] = keyword_hash; } @@ -2302,6 +2307,10 @@ vm_yield_setup_block_args(rb_thread_t *th, const rb_iseq_t * iseq, /* keyword argument */ if (iseq->arg_keyword != -1) { + int arg_keywords_end = iseq->arg_keyword - (iseq->arg_block != -1); + for (i = iseq->arg_keywords; 0 < i; i--) { + argv[arg_keywords_end - i] = Qnil; + } argv[iseq->arg_keyword] = keyword_hash; } |