8000 merge revision(s) 16569: · documenting-ruby/ruby@0b5177f · GitHub
[go: up one dir, main page]

Skip to content

Commit 0b5177f

Browse files
committed
merge revision(s) 16569:
* marshal.c (marshal_load): should initialize arg.data used for reentrant check. [ruby-dev:34837] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17321 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent 012e50d commit 0b5177f

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
Sun Jun 15 23:17:34 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
2+
3+
* marshal.c (marshal_load): should initialize arg.data used for
4+
reentrant check. [ruby-dev:34837]
5+
16
Sun Jun 15 23:12:02 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
27

38
* parse.y (top_local_setup): fixed memory leak bug based on a

marshal.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ reentrant_check(obj, sym)
8989
VALUE obj;
9090
ID sym;
9191
{
92-
if (RBASIC(obj)->klass) {
92+
if (obj && RBASIC(obj)->klass) {
9393
rb_raise(rb_eRuntimeError, "%s reentered", rb_id2name(sym));
9494
}
9595
}
@@ -1434,6 +1434,7 @@ marshal_load(argc, argv)
14341434
}
14351435
arg.src = port;
14361436
arg.offset = 0;
1437+
arg.data = 0;
14371438

14381439
major = r_byte(&arg);
14391440
minor = r_byte(&arg);

version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define RUBY_RELEASE_DATE "2008-06-15"
33
#define RUBY_VERSION_CODE 185
44
#define RUBY_RELEASE_CODE 20080615
5-
#define RUBY_PATCHLEVEL 213
5+
#define RUBY_PATCHLEVEL 214
66

77
#define RUBY_VERSION_MAJOR 1
88
#define RUBY_VERSION_MINOR 8

0 commit comments

Comments
 (0)
0