diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-21 20:50:16 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-21 20:50:16 +0000 |
| commit | 255341597a86bcfc12441ad4a999951e6fc1fc19 (patch) | |
| tree | 9178ba658d8d023d06bc27b3e4de1998c65f5425 | |
| parent | 0590791d04c05240de1b823373f852c43eb4b602 (diff) | |
* proc.c (proc_dup): should copy safe_level from src proc
properly. a patch from Keita Yamaguchi
<keita.yamaguchi at gmail.com>
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16514 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | eval.c | 13 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 18 insertions, 7 deletions
@@ -1,3 +1,9 @@ +Thu May 22 05:45:30 2008 Yukihiro Matsumoto <[email protected]> + + * proc.c (proc_dup): should copy safe_level from src proc + properly. a patch from Keita Yamaguchi + <keita.yamaguchi at gmail.com> + Wed May 21 23:31:44 2008 Nobuyoshi Nakada <[email protected]> * eval.c (rb_get_method_body, rb_alias, rb_eval): should not cache @@ -8424,16 +8424,25 @@ proc_clone(self) * MISSING: documentation */ +#define PROC_TSHIFT (FL_USHIFT+1) +#define PROC_TMASK (FL_USER1|FL_USER2|FL_USER3) +#define PROC_TMAX (PROC_TMASK >> PROC_TSHIFT) + +static int proc_get_safe_level(VALUE); + static VALUE proc_dup(self) VALUE self; { struct BLOCK *orig, *data; VALUE bind; + int safe = proc_get_safe_level(self); Data_Get_Struct(self, struct BLOCK, orig); bind = Data_Make_Struct(rb_obj_class(self),struct BLOCK,blk_mark,blk_free,data); blk_dup(data, orig); + if (safe > PROC_TMAX) safe = PROC_TMAX; + FL_SET(bind, (safe << PROC_TSHIFT) & PROC_TMASK); return bind; } @@ -8537,10 +8546,6 @@ bind_eval(argc, argv, bindval) return rb_f_eval(argc+1, args, Qnil /* self will be searched in eval */); } -#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 @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2008-05-21" +#define RUBY_RELEASE_DATE "2008-05-22" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20080521 +#define RUBY_RELEASE_CODE 20080522 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 5 -#define RUBY_RELEASE_DAY 21 +#define RUBY_RELEASE_DAY 22 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |