summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-08-08 03:48:33 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-08-08 03:48:33 +0000
commitc49c51b76ec544e310f1881de087024f4def7585 (patch)
treebbe0cb14b245a23f3ab03f2e52a4589454187b46
parent25358510afd53a718e3b2b810be7ee1e7cf56ea4 (diff)
* marshal.c (w_object): should set `c_arg' at first.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4354 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--marshal.c8
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 94a4a637b5..4952787aae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@ Fri Aug 8 12:33:17 2003 WATANABE Hirofumi <eban@ruby-lang.org>
* bcc32/Makefile.sub: rubyw.exe should be a Windows GUI program.
add the -aa option to WLDFLAGS.
+Fri Aug 8 11:29:26 2003 Koji Arai <jca02266@nifty.ne.jp>
+
+ * marshal.c (w_object): should set `c_arg' at first.
+
Fri Aug 8 03:22:28 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/httputils.rb (FormData#list): should not take
diff --git a/marshal.c b/marshal.c
index 03992f6bdd..84125f767e 100644
--- a/marshal.c
+++ b/marshal.c
@@ -434,6 +434,10 @@ w_object(obj, arg, limit)
rb_raise(rb_eArgError, "exceed depth limit");
}
+ limit--;
+ c_arg.limit = limit;
+ c_arg.arg = arg;
+
if (ivtbl = rb_generic_ivar_table(obj)) {
w_byte(TYPE_IVAR, arg);
}
@@ -466,10 +470,6 @@ w_object(obj, arg, limit)
else {
long num;
- limit--;
- c_arg.limit = limit;
- c_arg.arg = arg;
-
if (st_lookup(arg->data, obj, &num)) {
w_byte(TYPE_LINK, arg);
w_long(num, arg);