aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-11-15 04:52:39 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-11-15 04:52:39 +0000
commit27b09bd55acf92a54b6b8eb2d34fe8ef3d2a0c6a (patch)
tree7eab386e843b1995852b91b060c0c9a6a1f82a71
parent0a6a0829c4a9ee74e171ff817af0a7624f599fbc (diff)
downloadruby-27b09bd55acf92a54b6b8eb2d34fe8ef3d2a0c6a.tar.gz
fix uninitialized memory reference.
* compile.c (iseq_set_sequence): clear kwargs (in ci_entries) memory area. kwargs ci entries are initialized by compiler. However, sometimes these initializations are skipped because corresponding calls are eliminated by some optimizations (for example, `if true` syntax elimnates else code). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60771 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--compile.c1
-rw-r--r--test/ruby/test_optimization.rb15
2 files changed, 16 insertions, 0 deletions
diff --git a/compile.c b/compile.c
index c270308acc..ca998bef15 100644
--- a/compile.c
+++ b/compile.c
@@ -1939,6 +1939,7 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
iseq->body->is_entries = ZALLOC_N(union iseq_inline_storage_entry, iseq->body->is_size);
iseq->body->ci_entries = (struct rb_call_info *)ruby_xmalloc(sizeof(struct rb_call_info) * iseq->body->ci_size +
sizeof(struct rb_call_info_with_kwarg) * iseq->body->ci_kw_size);
+ MEMZERO(iseq->body->ci_entries + iseq->body->ci_size, struct rb_call_info_with_kwarg, iseq->body->ci_kw_size); /* need to clear ci_kw entries */
iseq->body->cc_entries = ZALLOC_N(struct rb_call_cache, iseq->body->ci_size + iseq->body->ci_kw_size);
ISEQ_COMPILE_DATA(iseq)->ci_index = ISEQ_COMPILE_DATA(iseq)->ci_kw_index = 0;
diff --git a/test/ruby/test_optimization.rb b/test/ruby/test_optimization.rb
index 40015c57dd..3ea867e8e1 100644
--- a/test/ruby/test_optimization.rb
+++ b/test/ruby/test_optimization.rb
@@ -647,4 +647,19 @@ class TestRubyOptimization < Test::Unit::TestCase
eval "def foo; 1.times{|(a), &b| nil && a}; end"
END
end
+
+ def test_clear_unreachable_keyword_args
+ assert_separately [], <<-END
+ script = <<-EOS
+ if true
+ else
+ foo(k1:1)
+ end
+ EOS
+ GC.stress = true
+ 30.times{
+ RubyVM::InstructionSequence.compile(script)
+ }
+ END
+ end
end