From b7f40d86af3e98c4481caf1014ba5423901d4580 Mon Sep 17 00:00:00 2001 From: naruse Date: Wed, 8 Feb 2012 00:40:44 +0000 Subject: merge revision(s) 33201,33249,33328: [Backport #5564] * encoding.c (load_encoding): predefined encoding names are safe. [ruby-dev:44469] [Bug #5279] * transcode.c (load_transcoder_entry): ditto. * encoding.c (require_enc): reject only loading from untrusted load paths. [ruby-dev:44541] [Bug #5279] * transcode.c (load_transcoder_entry): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34465 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- transcode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'transcode.c') diff --git a/transcode.c b/transcode.c index 4d9462fca6..64d093dbec 100644 --- a/transcode.c +++ b/transcode.c @@ -369,6 +369,7 @@ load_transcoder_entry(transcoder_entry_t *entry) size_t len = strlen(lib); char path[sizeof(transcoder_lib_prefix) + MAX_TRANSCODER_LIBNAME_LEN]; VALUE fn; + const int safe = rb_safe_level(); entry->lib = NULL; @@ -379,7 +380,7 @@ load_transcoder_entry(transcoder_entry_t *entry) fn = rb_str_new2(path); FL_UNSET(fn, FL_TAINT|FL_UNTRUSTED); OBJ_FREEZE(fn); - if (!rb_require_safe(fn, rb_safe_level())) + if (!rb_require_safe(fn, safe > 3 ? 3 : safe)) return NULL; } -- cgit v1.2.3