From 672b8bf1c038fc12d799ad56da3ac860890fe055 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 4 Apr 2013 21:36:38 +0000
Subject: 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
---
 object.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'object.c')

diff --git a/object.c b/object.c
index 6861525e8e..355a7569e5 100644
--- a/object.c
+++ b/object.c
@@ -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;
-- 
cgit v1.2.3