matz	2008-05-05 20:01:10 +0900 (Mon, 05 May 2008)

  New Revision: 16296

  Modified files:
    trunk/ChangeLog
    trunk/compile.c

  Log:
    * compile.c (defined_expr): protect some expression from
      segmentation fault.  a patch from wanabe <s.wanabe at gmail.com>
      in [ruby-dev:34593].
    
    * compile.c (defined_expr):

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/compile.c?r1=16296&r2=16295&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16296&r2=16295&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 16295)
+++ ChangeLog	(revision 16296)
@@ -1,3 +1,13 @@
+Mon May  5 19:58:44 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* 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@r...>
+
+	* compile.c (defined_expr): 
+
 Mon May  5 19:49:59 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* struct.c (rb_struct_s_def): Struct.new(0) should not SEGV.
Index: compile.c
===================================================================
--- compile.c	(revision 16295)
+++ compile.c	(revision 16296)
@@ -2464,6 +2464,7 @@
 		  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 @@
 	}
 	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 */
     }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/