From a4587840cc2b002321af227ee2cb315a94158d67 Mon Sep 17 00:00:00 2001 From: akr Date: Thu, 4 Apr 2013 13:26:39 +0000 Subject: * object.c (rb_mod_cvar_set): Reverted "avoid inadvertent symbol creation" to avoid SEGV by Class.new.class_variable_set(1, 2). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40108 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- object.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'object.c') diff --git a/object.c b/object.c index 8ee6d033a4..6861525e8e 100644 --- a/object.c +++ b/object.c @@ -2296,21 +2296,11 @@ rb_mod_cvar_get(VALUE obj, VALUE iv) static VALUE rb_mod_cvar_set(VALUE obj, VALUE iv, VALUE val) { - ID id; + ID id = rb_to_id(iv); - 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_id(iv)) { - rb_name_error_str(iv, "`%"PRIsVALUE"' is not allowed as a class variable name", - QUOTE(iv)); - } - else { - id = rb_to_id(iv); + if (!rb_is_class_id(id)) { + rb_name_error(id, "`%"PRIsVALUE"' is not allowed as a class variable name", + QUOTE_ID(id)); } rb_cvar_set(obj, id, val); return val; -- cgit v1.2.3