From 3a6c3a672feeafb46f682b68295dd9a13f5b4725 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 6 Sep 2011 04:15:49 +0000
Subject: * encoding.c (load_encoding): predefined encoding names are safe.  
 [ruby-dev:44469] [Bug #5279] * transcode.c (load_transcoder_entry): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33201 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 encoding.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'encoding.c')

diff --git a/encoding.c b/encoding.c
index e5bc75b4ef..57af9762e9 100644
--- a/encoding.c
+++ b/encoding.c
@@ -561,6 +561,7 @@ load_encoding(const char *name)
 	else if (ISUPPER(*s)) *s = TOLOWER(*s);
 	++s;
     }
+    FL_UNSET(enclib, FL_TAINT|FL_UNTRUSTED);
     OBJ_FREEZE(enclib);
     ruby_verbose = Qfalse;
     ruby_debug = Qfalse;
-- 
cgit v1.2.3