diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | load.c | 6 |
2 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sat Jan 31 19:09:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * load.c (rb_require_safe): raises when the path to be loaded is + tainted. [ruby-dev:37843] + Sat Jan 31 18:08:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * configure.in (optflags): defaulted to -O3 to get rid of slug of @@ -554,13 +554,17 @@ rb_require_safe(VALUE fname, int safe) rb_set_safe_level_force(safe); FilePathValue(fname); RB_GC_GUARD(fname) = rb_str_new4(fname); + rb_set_safe_level_force(0); found = search_required(fname, &path); if (found) { if (!path || !(ftptr = load_lock(RSTRING_PTR(path)))) { result = Qfalse; } else { - rb_set_safe_level_force(0); + if (safe > 0 && OBJ_TAINTED(path)) { + rb_raise(rb_eSecurityError, "cannot load from insecure path - %s", + RSTRING_PTR(path)); + } switch (found) { case 'r': rb_load(path, 0); |