aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--string.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a689ba577c..584a6b8895 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 ecdd0cbbe5..8f95b42fc1 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);
}