From b433f167b4810ba1e1117ac151141cdf30ce2a5f Mon Sep 17 00:00:00 2001 From: shyouhei Date: Mon, 16 Jun 2008 06:42:38 +0000 Subject: merge revision(s) 16514: * proc.c (proc_dup): should copy safe_level from src proc properly. a patch from Keita Yamaguchi git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17357 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ eval.c | 13 +++++++++---- version.h | 8 ++++---- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index f55d50aac7..51d7051c72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Jun 16 15:40:37 2008 Yukihiro Matsumoto + + * proc.c (proc_dup): should copy safe_level from src proc + properly. a patch from Keita Yamaguchi + + Sun Jun 15 23:31:10 2008 Nobuyoshi Nakada * ext/zlib/extconf.rb: search zlib1, and regard mswin32 later than VC6 diff --git a/eval.c b/eval.c index ab078c6d7a..3dc2eac856 100644 --- a/eval.c +++ b/eval.c @@ -8251,16 +8251,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; } @@ -8322,10 +8331,6 @@ rb_f_binding(self) return bind; } -#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 diff --git a/version.h b/version.h index 7178ab178e..e876da1790 100644 --- a/version.h +++ b/version.h @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.5" -#define RUBY_RELEASE_DATE "2008-06-15" +#define RUBY_RELEASE_DATE "2008-06-16" #define RUBY_VERSION_CODE 185 -#define RUBY_RELEASE_CODE 20080615 -#define RUBY_PATCHLEVEL 220 +#define RUBY_RELEASE_CODE 20080616 +#define RUBY_PATCHLEVEL 221 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 5 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 15 +#define RUBY_RELEASE_DAY 16 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit v1.2.3