diff options
author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-26 03:12:58 +0000 |
---|---|---|
committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-26 03:12:58 +0000 |
commit | c46c73c7a287f7bb16e004a9838e724540214b63 (patch) | |
tree | 1e9c868ada4358ab93844140ac2c360323398296 /marshal.c | |
parent | 35ec34fa2f20e208e2d1ad5574c7d81a8ae9ecc3 (diff) |
Merge from ruby_1_8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16606 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'marshal.c')
-rw-r--r-- | marshal.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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; } |