ko1	2007-12-18 21:11:38 +0900 (Tue, 18 Dec 2007)

  New Revision: 14300

  Modified files:
    trunk/ChangeLog
    trunk/vm.c

  Log:
    * vm.c (invoke_block): merge 2 stack overflow checks.
    


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14300&r2=14299
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/vm.c?r1=14300&r2=14299

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14299)
+++ ChangeLog	(revision 14300)
@@ -1,3 +1,7 @@
+Tue Dec 18 21:09:23 2007  Koichi Sasada  <ko1@a...>
+
+	* vm.c (invoke_block): merge 2 stack overflow checks.
+
 Tue Dec 18 20:58:35 2007  Koichi Sasada  <ko1@a...>
 
 	* compile.c, insnhelper.ci, insns.def, object.c, vm.c, vm.h:
Index: vm.c
===================================================================
--- vm.c	(revision 14299)
+++ vm.c	(revision 14300)
@@ -550,8 +550,7 @@
 
 	rb_vm_set_finish_env(th);
 
-	CHECK_STACK_OVERFLOW(th->cfp, argc);
-	CHECK_STACK_OVERFLOW(th->cfp, iseq->stack_max);
+	CHECK_STACK_OVERFLOW(th->cfp, argc + iseq->stack_max);
 
 	for (i=0; i<argc; i++) {
 	    th->cfp->sp[i] = argv[i];

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