From 30e97cbb8b4095250784cae859ba970413451f45 Mon Sep 17 00:00:00 2001 From: akr Date: Sun, 18 Nov 2007 11:50:25 +0000 Subject: [PATCH] * marshal.c (mark_dump_arg): it may be called after dump_ensure. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13961 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ marshal.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 0bd05ff231..ee386b3758 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Nov 18 20:47:41 2007 Tanaka Akira + + * marshal.c (mark_dump_arg): it may be called after dump_ensure. + Sun Nov 18 18:27:47 2007 Tanaka Akira * time.c (time_minus): fix Time.at(2**60+1) - Time.at(2**60). diff --git a/marshal.c b/marshal.c index 1d883bfdd6..23669b9290 100644 --- a/marshal.c +++ b/marshal.c @@ -153,6 +153,8 @@ static void mark_dump_arg(void *ptr) { struct dump_arg *p = ptr; + if (!ptr) + return; rb_mark_set(p->data); rb_mark_hash(p->compat_tbl); }