diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-04 21:36:38 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-04 21:36:38 +0000 |
commit | 672b8bf1c038fc12d799ad56da3ac860890fe055 (patch) | |
tree | 049e4733e014fa65e51832dec1e1a1235834f534 /object.c | |
parent | dc5b184b1f9c5ab8212b28cee07f5b0edf7aa3c2 (diff) | |
download | ruby-672b8bf1c038fc12d799ad56da3ac860890fe055.tar.gz |
object.c: avoid inadvertent symbol creation
* object.c (rb_mod_cvar_set): fix typo.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40114 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'object.c')
-rw-r--r-- | object.c | 18 |
1 files changed, 14 insertions, 4 deletions
@@ -2296,11 +2296,21 @@ rb_mod_cvar_get(VALUE obj, VALUE iv) static VALUE rb_mod_cvar_set(VALUE obj, VALUE iv, VALUE val) { - ID id = rb_to_id(iv); + ID id; - if (!rb_is_class_id(id)) { - rb_name_error(id, "`%"PRIsVALUE"' is not allowed as a class variable name", - QUOTE_ID(id)); + if (SYMBOL_P(iv)) { + id = SYM2ID(iv); + if (!rb_is_class_id(id)) { + rb_name_error(id, "`%"PRIsVALUE"' is not allowed as an class variable name", + QUOTE_ID(id)); + } + } + else if (!rb_is_class_name(iv)) { + rb_name_error_str(iv, "`%"PRIsVALUE"' is not allowed as a class variable name", + QUOTE(iv)); + } + else { + id = rb_to_id(iv); } rb_cvar_set(obj, id, val); return val; |