diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 14:16:05 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 14:16:05 +0000 |
commit | 012e50dd87bf27dc7d9a6f42ded0ca91fa68ab16 (patch) | |
tree | 66d2cdf6c45060edddf9553be8505bfc4f6cd15f /eval.c | |
parent | 893e02d718f5fb01b0d5690d3f6093c7faf8a55f (diff) |
merge revision(s) 16564:
* marshal.c (reentrant_check): check reentrance via callcc.
[ruby-dev:34802]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17317 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -5469,7 +5469,7 @@ rb_ensure(b_proc, data1, e_proc, data2) } POP_TAG(); retval = prot_tag ? prot_tag->retval : Qnil; /* save retval */ - (*e_proc)(data2); + (*e_proc)(data2); if (prot_tag) return_value(retval); if (state) JUMP_TAG(state); return result; |