From 85a4190da8f4be660e6e5a8baa638c60551f9754 Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 5 May 2008 11:01:10 +0000 Subject: * compile.c (defined_expr): protect some expression from segmentation fault. a patch from wanabe in [ruby-dev:34593]. * compile.c (defined_expr): git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@16296 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 10 ++++++++++ compile.c | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d3008bbd1..d4a339045 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Mon May 5 19:58:44 2008 Yukihiro Matsumoto + + * compile.c (defined_expr): protect some expression from + segmentation fault. a patch from wanabe + in [ruby-dev:34593]. + +Mon May 5 19:57:42 2008 Yukihiro Matsumoto + + * compile.c (defined_expr): + Mon May 5 19:49:59 2008 Yukihiro Matsumoto * struct.c (rb_struct_s_def): Struct.new(0) should not SEGV. diff --git a/compile.c b/compile.c index a5604fa9a..7b077a30b 100644 --- a/compile.c +++ b/compile.c @@ -2464,6 +2464,7 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret, needstr); return 1; + case NODE_SUPER: case NODE_ZSUPER: ADD_INSN(ret, nd_line(node), putnil); ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_ZSUPER), 0, @@ -2507,7 +2508,7 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret, } ADD_LABEL(ret, lend); - ADD_CATCH_ENTRY(CATCH_TYPE_ENSURE, lstart, lend, ensure, lfinish[1]); + ADD_CATCH_ENTRY(CATCH_TYPE_RESCUE, lstart, lend, ensure, lfinish[1]); return 1; } /* end of default */ } -- cgit