* string.c (rb_str_intern): raise SecurityError only when $SAFE

  level is greater than zero.  [ruby-core:08862]

* parse.y (rb_interned_p): new function to check if a string is
  already interned.

* object.c (str_to_id): use rb_str_intern().


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10930 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 7 deletions

diff --git a/object.c b/object.c
index 1c0a03b19a..d66e24e6de 100644
--- a/object.c
+++ b/object.c
@@ -1606,13 +1606,9 @@ static ID
 str_to_id(str)
     VALUE str;
 {
-    if (!RSTRING(str)->ptr || RSTRING(str)->len == 0) {
-	rb_raise(rb_eArgError, "empty symbol string");
-    }
-    if (RSTRING(str)->len != strlen(RSTRING(str)->ptr)) {
-	rb_warn("Symbols should not contain NUL (\\0)");
-    }
-    return rb_intern(RSTRING(str)->ptr);
+    VALUE sym = rb_str_intern(str);
+
+    return SYM2ID(sym);
 }
 
 ID