diff --git a/ChangeLog b/ChangeLog index d3008bbd18..d4a339045b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Mon May 5 19:58:44 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * compile.c (defined_expr): protect some expression from + segmentation fault. a patch from wanabe <s.wanabe at gmail.com> + in [ruby-dev:34593]. + +Mon May 5 19:57:42 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * compile.c (defined_expr): + Mon May 5 19:49:59 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * struct.c (rb_struct_s_def): Struct.new(0) should not SEGV. diff --git a/compile.c b/compile.c index a5604fa9ae..7b077a30b4 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 */ }