summaryrefslogtreecommitdiff
path: root/object.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-14 07:25:56 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-14 07:25:56 +0000
commitb6f0af788882c25feacb68184ec0f7c04f52f2c5 (patch)
treeab726f463981a1effe9690b4b6236cb083b2791f /object.c
parent127ac9f03ed2f3780c78b980dbae621ec43eef44 (diff)
* 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
Diffstat (limited to 'object.c')
-rw-r--r--object.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/object.c b/object.c
index 1c0a03b..d66e24e 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