diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-09 09:26:23 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-09 09:26:23 +0000 |
commit | c79402c4f0e40a3ebebda9761e47ff1b3d12ed53 (patch) | |
tree | 1f294f56e7fa4ceaebb89026fb9bdf2ff9ad87aa | |
parent | f6dcbf7472429fef251e2478fb89c7f091504d11 (diff) | |
download | ruby-c79402c4f0e40a3ebebda9761e47ff1b3d12ed53.tar.gz |
symbol.h: unexpected safe call
* symbol.h (is_attrset_id): ASET is an attrset ID. fix
unexpected safe call instead of an ordinary ASET.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53485 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | symbol.h | 2 | ||||
-rw-r--r-- | test/ruby/test_call.rb | 7 |
3 files changed, 13 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sat Jan 9 18:25:57 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * symbol.h (is_attrset_id): ASET is an attrset ID. fix + unexpected safe call instead of an ordinary ASET. + Sat Jan 9 10:44:33 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * configure.in, win32/setup.mak: extract RUBY_PROGRAM_VERSION from @@ -36,7 +36,7 @@ struct RSymbol { #define is_local_id(id) (id_type(id)==ID_LOCAL) #define is_global_id(id) (id_type(id)==ID_GLOBAL) #define is_instance_id(id) (id_type(id)==ID_INSTANCE) -#define is_attrset_id(id) (id_type(id)==ID_ATTRSET) +#define is_attrset_id(id) ((id)==idASET||id_type(id)==ID_ATTRSET) #define is_const_id(id) (id_type(id)==ID_CONST) #define is_class_id(id) (id_type(id)==ID_CLASS) #define is_junk_id(id) (id_type(id)==ID_JUNK) diff --git a/test/ruby/test_call.rb b/test/ruby/test_call.rb index 7ef8d06936..fb79eadb64 100644 --- a/test/ruby/test_call.rb +++ b/test/ruby/test_call.rb @@ -83,4 +83,11 @@ class TestCall < Test::Unit::TestCase def test_safe_call_block_call_command assert_nil(("a".sub! "b" do end&.foo 1 do end)) end + + def test_invalid_safe_call + h = nil + assert_raise(NoMethodError) { + h[:foo] = nil + } + end end |