diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-06-18 14:12:42 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-06-18 14:12:42 +0000 |
commit | 31764d62ce2429077f85259e1c54910f851811f9 (patch) | |
tree | f54e98c358e5416a4a5cec8a3f97a40cc509e4e8 /eval.c | |
parent | afa8c5c272ad13359b947b0724cce06e52b29a57 (diff) | |
download | ruby-31764d62ce2429077f85259e1c54910f851811f9.tar.gz |
* eval.c (proc_save_safe_level, rb_set_safe_level, safe_setter): limit
safe level.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6471 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -7876,12 +7876,17 @@ rb_f_binding(self) #define PROC_TSHIFT (FL_USHIFT+1) #define PROC_TMASK (FL_USER1|FL_USER2|FL_USER3) +#define PROC_TMAX (PROC_TMASK >> PROC_TSHIFT) + +#define SAFE_LEVEL_MAX PROC_TMASK static void proc_save_safe_level(data) VALUE data; { - FL_SET(data, (ruby_safe_level << PROC_TSHIFT) & PROC_TMASK); + int safe = ruby_safe_level; + if (safe > PROC_TMAX) safe = PROC_TMAX; + FL_SET(data, (safe << PROC_TSHIFT) & PROC_TMASK); } static int @@ -9582,6 +9587,7 @@ rb_set_safe_level(level) int level; { if (level > ruby_safe_level) { + if (level > SAFE_LEVEL_MAX) level = SAFE_LEVEL_MAX; ruby_safe_level = level; curr_thread->safe = level; } @@ -9603,6 +9609,7 @@ safe_setter(val) rb_raise(rb_eSecurityError, "tried to downgrade safe level from %d to %d", ruby_safe_level, level); } + if (level > SAFE_LEVEL_MAX) level = SAFE_LEVEL_MAX; ruby_safe_level = level; curr_thread->safe = level; } |