diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-09-11 10:56:54 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-09-11 10:56:54 +0000 |
| commit | 921aed777864970c7408a0d335c4fd44565f6457 (patch) | |
| tree | f2ab0058d8538ec32181ba4adf719a388258cbd2 /encoding.c | |
| parent | 05c2cc90895750255f64254f2491ff0ad77cc13a (diff) | |
merges r33201 from trunk into ruby_1_9_3.
--
* 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/branches/ruby_1_9_3@33249 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
| -rw-r--r-- | encoding.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/encoding.c b/encoding.c index 0b6bf96bc5..629fa04ee5 100644 --- a/encoding.c +++ b/encoding.c @@ -554,6 +554,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; |