diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-10-27 07:48:53 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-10-27 07:48:53 +0000 |
| commit | 04b031656add2a8c9f7f2136e4fc7fc16c9ac901 (patch) | |
| tree | 2998e533888161f911a99d87e7ca7021b3ce3f13 /eval_intern.h | |
| parent | ad559b5c1cbaa50273c8063951a4e64a9f2c1fe7 (diff) | |
merge revision(s) 56252,56254: [Backport #12743]
* eval_intern.h (TH_PUSH_TAG): Initialize struct rb_vm_tag::tag with
Qundef rather than 0 which is equal to Qfalse. Since Kernel#throw(obj)
searches a tag with rb_vm_tag::tag == obj, throw(false) can
accidentally find an unrelated tag which is not created by
Kernel#catch. [ruby-core:77229] [Bug #12743]
* test/ruby/test_exception.rb (test_throw_false): Add a test case for
this.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@56505 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval_intern.h')
| -rw-r--r-- | eval_intern.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/eval_intern.h b/eval_intern.h index 163eeb1a85..9dc6f7841a 100644 --- a/eval_intern.h +++ b/eval_intern.h @@ -122,7 +122,7 @@ LONG WINAPI rb_w32_stack_overflow_handler(struct _EXCEPTION_POINTERS *); #define TH_PUSH_TAG(th) do { \ rb_thread_t * const _th = (th); \ struct rb_vm_tag _tag; \ - _tag.tag = 0; \ + _tag.tag = Qundef; \ _tag.prev = _th->tag; #define TH_POP_TAG() \ |