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 --- encoding.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'encoding.c') diff --git a/encoding.c b/encoding.c index 744be89223..18f54e684c 100644 --- a/encoding.c +++ b/encoding.c @@ -536,7 +536,8 @@ rb_enc_registered(const char *name) static VALUE require_enc(VALUE enclib) { - return rb_require_safe(enclib, rb_safe_level()); + int safe = rb_safe_level(); + return rb_require_safe(enclib, safe > 3 ? 3 : safe); } static int -- cgit v1.2.3