From 9060b3355a9d67e547b71e81a6bb20d7199822f2 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 21 Jun 2003 14:51:21 +0000
Subject: * object.c (str_to_id): check for empty string before intern.  
 [ruby-talk:74006]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3975 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 object.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'object.c')

diff --git a/object.c b/object.c
index 1e7c5c1d45..33502dbc3b 100644
--- a/object.c
+++ b/object.c
@@ -779,6 +779,16 @@ rb_class_superclass(klass)
     return super;
 }
 
+static ID
+str_to_id(str)
+    VALUE str;
+{
+    if (!RSTRING(str)->ptr || RSTRING(str)->len == 0) {
+	rb_raise(rb_eArgError, "empty symbol string");
+    }
+    return rb_intern(RSTRING(str)->ptr);
+}
+
 ID
 rb_to_id(name)
     VALUE name;
@@ -788,7 +798,7 @@ rb_to_id(name)
 
     switch (TYPE(name)) {
       case T_STRING:
-	return rb_str_intern(name);
+	return str_to_id(name);
       case T_FIXNUM:
 	rb_warn("do not use Fixnums as Symbols");
 	id = FIX2LONG(name);
@@ -802,7 +812,7 @@ rb_to_id(name)
       default:
 	tmp = rb_check_string_type(name);
 	if (!NIL_P(tmp)) {
-	    return rb_str_intern(tmp);
+	    return str_to_id(tmp);
 	}
 	rb_raise(rb_eTypeError, "%s is not a symbol", RSTRING(rb_inspect(name))->ptr);
     }
-- 
cgit v1.2.3