diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-02-21 00:14:07 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-02-21 00:14:07 +0000 |
| commit | e3b0b6d5fecf52402c333be90c31b32bb04c43ac (patch) | |
| tree | edf0c7a7ae3bc0a7bb30f5677422d1024d24be24 | |
| parent | 975ce3add3c95ddb53351de9b90e71ed8e1aacd0 (diff) | |
| download | ruby-e3b0b6d5fecf52402c333be90c31b32bb04c43ac.tar.gz | |
* 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
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | eval_load.c | 8 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 15 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Wed Feb 21 09:14:04 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * eval_load.c (rb_require_safe): should restore safe level. + Tue Feb 20 21:19:29 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp> * ext/win32ole/win32ole.c (installed_code_page_proc, 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); } @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2007-02-20" +#define RUBY_RELEASE_DATE "2007-02-21" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20070220 +#define RUBY_RELEASE_CODE 20070221 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 20 +#define RUBY_RELEASE_DAY 21 RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_release_date[]; |