summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-06 17:19:11 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-06 17:19:11 +0000
commit4bc34b34af316335a6cbe0bd775d8a67f68fca33 (patch)
treeebfb28f6e3c141d3f993652bb14d663c31d284b1
parent5dbd12698fde521dbf79216d4c3ea25d767ffd3f (diff)
downloadruby-4bc34b34af316335a6cbe0bd775d8a67f68fca33.tar.gz
ruby-4bc34b34af316335a6cbe0bd775d8a67f68fca33.tar.xz
ruby-4bc34b34af316335a6cbe0bd775d8a67f68fca33.zip
* string.c (rb_str_intern): need not to check if tainted.
[ruby-dev:34219] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15912 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--string.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a689ba577..584a6b889 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Apr 7 02:12:27 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * string.c (rb_str_intern): need not to check if tainted.
+ [ruby-dev:34219]
+
Sun Apr 6 09:45:00 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dir.c (dir_tell): check if closed. [ruby-core:16223]
diff --git a/string.c b/string.c
index ecdd0cbbe..8f95b42fc 100644
--- a/string.c
+++ b/string.c
@@ -5792,9 +5792,6 @@ rb_str_intern(VALUE s)
VALUE str = RB_GC_GUARD(s);
ID id;
- if (OBJ_TAINTED(str) && rb_safe_level() >= 1) {
- rb_raise(rb_eSecurityError, "Insecure: can't intern tainted string");
- }
id = rb_intern_str(str);
return ID2SYM(id);
}