From 4a41ddbed20a307e184f58abc19f376d32939392 Mon Sep 17 00:00:00 2001 From: usa Date: Mon, 26 May 2008 01:22:23 +0000 Subject: * marshal.c (dump_ensure, load_ensure): should return values. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16602 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ marshal.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d40168cbaf..7def108602 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon May 26 10:21:24 2008 NAKAMURA Usaku + + * marshal.c (dump_ensure, load_ensure): should return values. + Mon May 26 10:03:35 2008 Akinori MUSHA * eval.c (yield_under, yield_under_i, yield_args_under_i) diff --git a/marshal.c b/marshal.c index a0663db2b8..bae313d891 100644 --- a/marshal.c +++ b/marshal.c @@ -703,7 +703,7 @@ static VALUE dump_ensure(arg) struct dump_arg *arg; { - if (RBASIC(arg->str)->klass) return; /* ignore reentrant */ + if (RBASIC(arg->str)->klass) return 0; /* ignore reentrant */ st_free_table(arg->symbols); st_free_table(arg->data); if (arg->taint) { @@ -1388,7 +1388,7 @@ static VALUE load_ensure(arg) struct load_arg *arg; { - if (RBASIC(arg->data)->klass) return; /* ignore reentrant */ + if (RBASIC(arg->data)->klass) return 0; /* ignore reentrant */ st_free_table(arg->symbols); return 0; } -- cgit v1.2.3