summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-27 08:29:38 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-27 08:29:38 +0000
commite37bc8ab8002f6f5980804ec6237513bebd2eebc (patch)
tree6c9a777a3d339760a73e24dad6cb304293b1f89c
parent88960eb7070d9f5c34a84f57a005c9d5602ed229 (diff)
merge revision(s) 19652:
* marshal.c (marshal_dump): initializes dump_arg before any funcall. [ruby-dev:36648] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@21800 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--marshal.c8
-rw-r--r--version.h2
3 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 9d40368af4..59a9165c11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan 27 17:29:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * marshal.c (marshal_dump): initializes dump_arg before any funcall.
+ [ruby-dev:36648]
+
Tue Jan 27 15:16:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/socket/socket.c (host_str): numeric address should be unsigned.
diff --git a/marshal.c b/marshal.c
index 5f14dae901..253b78a990 100644
--- a/marshal.c
+++ b/marshal.c
@@ -776,8 +776,12 @@ marshal_dump(argc, argv)
else port = a1;
}
arg.dest = 0;
+ arg.symbols = st_init_numtable();
+ arg.data = st_init_numtable();
+ arg.taint = Qfalse;
arg.str = rb_str_buf_new(0);
RBASIC(arg.str)->klass = 0;
+ arg.wrapper = Data_Wrap_Struct(rb_cData, mark_dump_arg, 0, &arg);
if (!NIL_P(port)) {
if (!rb_respond_to(port, s_write)) {
type_error:
@@ -793,10 +797,6 @@ marshal_dump(argc, argv)
port = arg.str;
}
- arg.symbols = st_init_numtable();
- arg.data = st_init_numtable();
- arg.taint = Qfalse;
- arg.wrapper = Data_Wrap_Struct(rb_cData, mark_dump_arg, 0, &arg);
c_arg.obj = obj;
c_arg.arg = &arg;
c_arg.limit = limit;
diff --git a/version.h b/version.h
index 0c1acef9b6..b8a261e0a1 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2009-01-27"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20090127
-#define RUBY_PATCHLEVEL 311
+#define RUBY_PATCHLEVEL 312
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8