diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-09 14:57:04 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-09 14:57:04 +0000 |
commit | 24cf72029f0c43f59520b88d1eafee4959bcddc1 (patch) | |
tree | 5a95f9566d6389ff96fa1e8cb283fcb64ec7de67 /object.c | |
parent | 372eb2cbfed1b7f5d7e2af1ced551ab4087c95a5 (diff) | |
download | ruby-24cf72029f0c43f59520b88d1eafee4959bcddc1.tar.gz |
object.c: avoid inadvertent symbol creation
* object.c (id_for_attr): avoid inadvertent symbol creation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43219 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'object.c')
-rw-r--r-- | object.c | 37 |
1 files changed, 33 insertions, 4 deletions
@@ -1889,6 +1889,35 @@ check_setter_id(VALUE name, int (*valid_id_p)(ID), int (*valid_name_p)(VALUE), return id; } +static int +rb_is_attr_id(ID id) +{ + return rb_is_local_id(id) || rb_is_const_id(id); +} + +static int +rb_is_attr_name(VALUE name) +{ + return rb_is_local_name(name) || rb_is_const_name(name); +} + +static const char invalid_attribute_name[] = "invalid attribute name `%"PRIsVALUE"'"; + +static ID +id_for_attr(VALUE name) +{ + return id_for_setter(name, attr, invalid_attribute_name); +} + +ID +rb_check_attr_id(ID id) +{ + if (!rb_is_attr_id(id)) { + rb_name_error_str(id, invalid_attribute_name, QUOTE_ID(id)); + } + return id; +} + /* * call-seq: * attr_reader(symbol, ...) -> nil @@ -1908,7 +1937,7 @@ rb_mod_attr_reader(int argc, VALUE *argv, VALUE klass) int i; for (i=0; i<argc; i++) { - rb_attr(klass, rb_to_id(argv[i]), TRUE, FALSE, TRUE); + rb_attr(klass, id_for_attr(argv[i]), TRUE, FALSE, TRUE); } return Qnil; } @@ -1918,7 +1947,7 @@ rb_mod_attr(int argc, VALUE *argv, VALUE klass) { if (argc == 2 && (argv[1] == Qtrue || argv[1] == Qfalse)) { rb_warning("optional boolean argument is obsoleted"); - rb_attr(klass, rb_to_id(argv[0]), 1, RTEST(argv[1]), TRUE); + rb_attr(klass, id_for_attr(argv[0]), 1, RTEST(argv[1]), TRUE); return Qnil; } return rb_mod_attr_reader(argc, argv, klass); @@ -1940,7 +1969,7 @@ rb_mod_attr_writer(int argc, VALUE *argv, VALUE klass) int i; for (i=0; i<argc; i++) { - rb_attr(klass, rb_to_id(argv[i]), FALSE, TRUE, TRUE); + rb_attr(klass, id_for_attr(argv[i]), FALSE, TRUE, TRUE); } return Qnil; } @@ -1968,7 +1997,7 @@ rb_mod_attr_accessor(int argc, VALUE *argv, VALUE klass) int i; for (i=0; i<argc; i++) { - rb_attr(klass, rb_to_id(argv[i]), TRUE, TRUE, TRUE); + rb_attr(klass, id_for_attr(argv[i]), TRUE, TRUE, TRUE); } return Qnil; } |