diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-02-03 06:23:34 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-02-03 06:23:34 +0000 |
commit | 5f6b1ad4768e18db330cfe8b62f0d66f5c935ead (patch) | |
tree | 4b9cf864c58949b8967bb4fb1720b92edd83cf86 /eval.c | |
parent | a72e8ebb65e7735ed08b1ea59f682eaa0102a42f (diff) | |
download | ruby-5f6b1ad4768e18db330cfe8b62f0d66f5c935ead.tar.gz |
eval.c: hide internal objects
* eval.c (rb_ensure): veil internal exception objects not to leak
in ensure functions. [ruby-core:79371] [Bug #13176]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57510 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -924,7 +924,7 @@ rb_ensure(VALUE (*b_proc)(ANYARGS), VALUE data1, VALUE (*e_proc)(ANYARGS), VALUE { int state; volatile VALUE result = Qnil; - volatile VALUE errinfo; + VALUE errinfo; rb_thread_t *const th = GET_THREAD(); rb_ensure_list_t ensure_list; ensure_list.entry.marker = 0; @@ -938,6 +938,9 @@ rb_ensure(VALUE (*b_proc)(ANYARGS), VALUE data1, VALUE (*e_proc)(ANYARGS), VALUE } TH_POP_TAG(); errinfo = th->errinfo; + if (!NIL_P(errinfo) && !RB_TYPE_P(errinfo, T_OBJECT)) { + th->errinfo = Qnil; + } th->ensure_list=ensure_list.next; (*ensure_list.entry.e_proc)(ensure_list.entry.data2); th->errinfo = errinfo; |