summaryrefslogtreecommitdiff
path: root/eval_load.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-21 00:14:07 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-21 00:14:07 +0000
commite3b0b6d5fecf52402c333be90c31b32bb04c43ac (patch)
treeedf0c7a7ae3bc0a7bb30f5677422d1024d24be24 /eval_load.c
parent975ce3add3c95ddb53351de9b90e71ed8e1aacd0 (diff)
* eval_load.c (rb_require_safe): should restore safe level.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11806 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval_load.c')
-rw-r--r--eval_load.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/eval_load.c b/eval_load.c
index 2048ea36b5..321fc31093 100644
--- a/eval_load.c
+++ b/eval_load.c
@@ -370,9 +370,15 @@ rb_require_safe(VALUE fname, int safe)
volatile VALUE errinfo = GET_THREAD()->errinfo;
rb_thread_t *th = GET_THREAD();
int state;
+ struct {
+ NODE *node;
+ int safe;
+ } volatile saved;
char *volatile ftptr = 0;
PUSH_TAG(PROT_NONE);
+ saved.node = ruby_current_node;
+ saved.safe = rb_safe_level();
if ((state = EXEC_TAG()) == 0) {
VALUE path;
long handle;
@@ -422,6 +428,8 @@ rb_require_safe(VALUE fname, int safe)
free(ftptr);
}
}
+ ruby_current_node = saved.node;
+ rb_set_safe_level_force(saved.safe);
if (state) {
JUMP_TAG(state);
}