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

struct.c: avoid inadvertent symbol creation

Browse Source 
* struct.c (make_struct): avoid inadvertent symbol creation.
  (rb_struct_aref): ditto.
  (rb_struct_aset): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40101 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-04-04 07:55:11 +00:00
parent 4e59c822a0
commit 112a3b1fca
3 changed files with 50 additions and 7 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:55:08 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* struct.c (make_struct): avoid inadvertent symbol creation.
(rb_struct_aref): ditto.
(rb_struct_aset): ditto.
Thu Apr 4 16:54:40 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Apr 4 16:54:40 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* object.c (rb_mod_const_set): avoid inadvertent symbol creation. * object.c (rb_mod_const_set): avoid inadvertent symbol creation.

31
struct.c
View File

@ -187,10 +187,11 @@ make_struct(VALUE name, VALUE members, VALUE klass)
else { else {
/* old style: should we warn? */ /* old style: should we warn? */
name = rb_str_to_str(name); name = rb_str_to_str(name);
id = rb_to_id(name); if (!rb_is_const_name(name)) {
if (!rb_is_const_id(id)) { rb_name_error_str(name, "identifier %"PRIsVALUE" needs to be constant",
rb_name_error(id, "identifier %s needs to be constant", StringValuePtr(name)); QUOTE(name));
} }
id = rb_to_id(name);
if (rb_const_defined_at(klass, id)) { if (rb_const_defined_at(klass, id)) {
rb_warn("redefining constant Struct::%s", StringValuePtr(name)); rb_warn("redefining constant Struct::%s", StringValuePtr(name));
rb_mod_remove_const(klass, ID2SYM(id)); rb_mod_remove_const(klass, ID2SYM(id));
@ -672,8 +673,16 @@ rb_struct_aref(VALUE s, VALUE idx)
{ {
long i; long i;
if (RB_TYPE_P(idx, T_STRING) || RB_TYPE_P(idx, T_SYMBOL)) { if (RB_TYPE_P(idx, T_SYMBOL)) {
return rb_struct_aref_id(s, rb_to_id(idx)); return rb_struct_aref_id(s, SYM2ID(idx));
}
else if (RB_TYPE_P(idx, T_STRING)) {
ID id = rb_check_id(&idx);
if (!id) {
rb_name_error_str(idx, "no member '%"PRIsVALUE"' in struct",
QUOTE(idx));
}
return rb_struct_aref_id(s, id);
} }
i = NUM2LONG(idx); i = NUM2LONG(idx);
@ -739,8 +748,16 @@ rb_struct_aset(VALUE s, VALUE idx, VALUE val)
{ {
long i; long i;
if (RB_TYPE_P(idx, T_STRING) || RB_TYPE_P(idx, T_SYMBOL)) { if (RB_TYPE_P(idx, T_SYMBOL)) {
return rb_struct_aset_id(s, rb_to_id(idx), val); return rb_struct_aset_id(s, SYM2ID(idx), val);
}
if (RB_TYPE_P(idx, T_STRING)) {
ID id = rb_check_id(&idx);
if (!id) {
rb_name_error_str(idx, "no member '%"PRIsVALUE"' in struct",
QUOTE(idx));
}
return rb_struct_aset_id(s, id, val);
} }
i = NUM2LONG(idx); i = NUM2LONG(idx);

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

@ -214,5 +214,25 @@ module Test_Symbol
assert_raise(NameError) {obj.instance_variable_set(name, true)} assert_raise(NameError) {obj.instance_variable_set(name, true)}
assert_not_send([Bug::Symbol, :interned?, name]) assert_not_send([Bug::Symbol, :interned?, name])
end end
def test_struct_new
name = noninterned_name
assert_raise(NameError) {Struct.new(name)}
assert_not_send([Bug::Symbol, :interned?, name])
end
def test_struct_aref
s = Struct.new(:foo).new
name = noninterned_name
assert_raise(NameError) {s[name]}
assert_not_send([Bug::Symbol, :interned?, name])
end
def test_struct_aset
s = Struct.new(:foo).new
name = noninterned_name
assert_raise(NameError) {s[name] = true}
assert_not_send([Bug::Symbol, :interned?, name])
end
end end
end end