1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

object.c: avoid inadvertent symbol creation

Browse Source 
* object.c (rb_mod_const_set): avoid inadvertent symbol creation.
  (rb_obj_ivar_set): ditto.
  (rb_mod_cvar_set): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40100 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-04-04 07:54:44 +00:00
parent 9f87297c21
commit 4e59c822a0
3 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Thu Apr 4 16:54:40 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* object.c (rb_mod_const_set): avoid inadvertent symbol creation.
(rb_obj_ivar_set): ditto.
(rb_mod_cvar_set): ditto.
Thu Apr 4 15:46:48 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Apr 4 15:46:48 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* enum.c (enum_inject): avoid inadvertent symbol creation. * enum.c (enum_inject): avoid inadvertent symbol creation.

30
object.c
View File

@ -2043,13 +2043,11 @@ rb_mod_const_get(int argc, VALUE *argv, VALUE mod)
static VALUE static VALUE
rb_mod_const_set(VALUE mod, VALUE name, VALUE value) rb_mod_const_set(VALUE mod, VALUE name, VALUE value)
{ {
ID id = rb_to_id(name); if (!SYMBOL_P(name) && !rb_is_const_name(name)) {
rb_name_error_str(name, "wrong constant name %"PRIsVALUE,
if (!rb_is_const_id(id)) { QUOTE(name));
rb_name_error(id, "wrong constant name %"PRIsVALUE,
QUOTE_ID(id));
} }
rb_const_set(mod, id, value); rb_const_set(mod, rb_to_id(name), value);
return value; return value;
} }
@ -2166,13 +2164,11 @@ rb_obj_ivar_get(VALUE obj, VALUE iv)
static VALUE static VALUE
rb_obj_ivar_set(VALUE obj, VALUE iv, VALUE val) rb_obj_ivar_set(VALUE obj, VALUE iv, VALUE val)
{ {
ID id = rb_to_id(iv); if (!SYMBOL_P(iv) && !rb_is_instance_name(iv)) {
rb_name_error_str(iv, "`%"PRIsVALUE"' is not allowed as an instance variable name",
if (!rb_is_instance_id(id)) { QUOTE(iv));
rb_name_error(id, "`%"PRIsVALUE"' is not allowed as an instance variable name",
QUOTE_ID(id));
} }
return rb_ivar_set(obj, id, val); return rb_ivar_set(obj, rb_to_id(iv), val);
} }
/* /*
@ -2277,13 +2273,11 @@ rb_mod_cvar_get(VALUE obj, VALUE iv)
static VALUE static VALUE
rb_mod_cvar_set(VALUE obj, VALUE iv, VALUE val) rb_mod_cvar_set(VALUE obj, VALUE iv, VALUE val)
{ {
ID id = rb_to_id(iv); if (!SYMBOL_P(iv) && !rb_is_class_id(iv)) {
rb_name_error_str(iv, "`%"PRIsVALUE"' is not allowed as a class variable name",
if (!rb_is_class_id(id)) { QUOTE(iv));
rb_name_error(id, "`%"PRIsVALUE"' is not allowed as a class variable name",
QUOTE_ID(id));
} }
rb_cvar_set(obj, id, val); rb_cvar_set(obj, rb_to_id(iv), val);
return val; return val;
} }

21
test/-ext-/symbol/test_inadvertent_creation.rb
View File

@ -193,5 +193,26 @@ module Test_Symbol
assert_raise(NoMethodError) {[1, 2].inject(name)} assert_raise(NoMethodError) {[1, 2].inject(name)}
assert_not_send([Bug::Symbol, :interned?, name]) assert_not_send([Bug::Symbol, :interned?, name])
end end
def test_module_const_set
name = noninterned_name
mod = Module.new
assert_raise(NameError) {mod.const_set(name, true)}
assert_not_send([Bug::Symbol, :interned?, name])
end
def test_module_cvar_set
name = noninterned_name
mod = Module.new
assert_raise(NameError) {mod.class_variable_set(name, true)}
assert_not_send([Bug::Symbol, :interned?, name])
end
def test_object_ivar_set
name = noninterned_name
obj = Object.new
assert_raise(NameError) {obj.instance_variable_set(name, true)}
assert_not_send([Bug::Symbol, :interned?, name])
end
end end
end end