* eval_intern.h (CHECK_STACK_OVERFLOW): reserve frame size.

[ruby-dev:32485] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14157 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
lann · Dec 9, 2007 · a44f38f · a44f38f
1 parent 3923d7f
commit a44f38f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,7 +1,12 @@
+Sun Dec  9 14:59:15 2007  Koichi Sasada  <[email protected]>
+
+	* eval_intern.h (CHECK_STACK_OVERFLOW): reserve frame size.
+	  [ruby-dev:32485]
+
 Sun Dec  9 14:38:25 2007  Koichi Sasada  <[email protected]>
 
 	* vm.c (rb_thread_mark): use rb_gc_mark_maybe() for
-	  VM stack specified by mark_stack_len.
+	  VM stack specified by mark_stack_len.  [ruby-dev:32462]
 
 	* insnhelper.ci: clear vm stack extended by opt value.
 

diff --git a/eval_intern.h b/eval_intern.h
@@ -187,7 +187,7 @@ char *strrchr _((const char *, const char));
 }
 
 #define CHECK_STACK_OVERFLOW(cfp, margin) do \
-  if (((VALUE *)(cfp)->sp) + (margin) >= ((VALUE *)cfp)) { \
+  if (((VALUE *)(cfp)->sp) + (margin) + sizeof(rb_control_frame_t) >= ((VALUE *)cfp)) { \
       rb_exc_raise(sysstack_error); \
   } \
 while (0)