Skip to content

Commit a2ac560

Browse files
shyouheishyouhei
committed
merge revision(s) 16514:
 * 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_6@17359 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent cec17bd commit a2ac560

File tree

3 files changed

+19
-8
lines changed

3 files changed

+19
-8
lines changed

‎ChangeLog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
Mon Jun 16 15:43:07 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
2+
3+
* proc.c (proc_dup): should copy safe_level from src proc
4+
properly. a patch from Keita Yamaguchi
5+
<keita.yamaguchi at gmail.com>
6+
17
Sun Jun 15 23:31:10 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
28

39
* ext/zlib/extconf.rb: search zlib1, and regard mswin32 later than VC6

‎eval.c

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8345,16 +8345,25 @@ proc_clone(self)
83458345
* MISSING: documentation
83468346
*/
83478347

8348+
#define PROC_TSHIFT (FL_USHIFT+1)
8349+
#define PROC_TMASK (FL_USER1|FL_USER2|FL_USER3)
8350+
#define PROC_TMAX (PROC_TMASK >> PROC_TSHIFT)
8351+
8352+
static int proc_get_safe_level(VALUE);
8353+
83488354
static VALUE
83498355
proc_dup(self)
83508356
VALUE self;
83518357
{
83528358
struct BLOCK *orig, *data;
83538359
VALUE bind;
8360+
int safe = proc_get_safe_level(self);
83548361

83558362
Data_Get_Struct(self, struct BLOCK, orig);
83568363
bind = Data_Make_Struct(rb_obj_class(self),struct BLOCK,blk_mark,blk_free,data);
83578364
blk_dup(data, orig);
8365+
if (safe > PROC_TMAX) safe = PROC_TMAX;
8366+
FL_SET(bind, (safe << PROC_TSHIFT) & PROC_TMASK);
83588367

83598368
return bind;
83608369
}
@@ -8416,10 +8425,6 @@ rb_f_binding(self)
84168425
return bind;
84178426
}
84188427

8419-
#define PROC_TSHIFT (FL_USHIFT+1)
8420-
#define PROC_TMASK (FL_USER1|FL_USER2|FL_USER3)
8421-
#define PROC_TMAX (PROC_TMASK >> PROC_TSHIFT)
8422-
84238428
#define SAFE_LEVEL_MAX PROC_TMASK
84248429

84258430
static void

‎version.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#define RUBY_VERSION "1.8.6"
2-
#define RUBY_RELEASE_DATE "2008-06-15"
2+
#define RUBY_RELEASE_DATE "2008-06-16"
33
#define RUBY_VERSION_CODE 186
4-
#define RUBY_RELEASE_CODE 20080615
5-
#define RUBY_PATCHLEVEL 221
4+
#define RUBY_RELEASE_CODE 20080616
5+
#define RUBY_PATCHLEVEL 222
66

77
#define RUBY_VERSION_MAJOR 1
88
#define RUBY_VERSION_MINOR 8
99
#define RUBY_VERSION_TEENY 6
1010
#define RUBY_RELEASE_YEAR 2008
1111
#define RUBY_RELEASE_MONTH 6
12-
#define RUBY_RELEASE_DAY 15
12+
#define RUBY_RELEASE_DAY 16
1313

1414
#ifdef RUBY_EXTERN
1515
RUBY_EXTERN const char ruby_version[];

0 commit comments

Comments
 (0)