diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 14:17:11 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 14:17:11 +0000 |
commit | d834f1b537d94edd942a8393101f2a06264c1098 (patch) | |
tree | 091f5c2802b9921b748764290a43aebea132ac9a /eval.c | |
parent | 8c9c9268a588c36633b5d2891899636cee4c2ba5 (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_6@17319 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -5502,7 +5502,7 @@ rb_ensure(b_proc, data1, e_proc, data2) POP_TAG(); retval = prot_tag ? prot_tag->retval : Qnil; /* save retval */ if (!thread_no_ensure()) { - (*e_proc)(data2); + (*e_proc)(data2); } if (prot_tag) return_value(retval); if (state) JUMP_TAG(state); |