From 07cab8007ee3832adbb2fd7280ce26f3c50bf5cc Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 17 Apr 2007 17:50:05 +0000
Subject: [PATCH] * yarvcore.c (th_init2): push initial blockptr value for  
 rb_block_given_p() outside ruby_exec().  [ruby-core:10923]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12191 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog  | 5 +++++
 yarvcore.c | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 885b8ce96d..35c4a10599 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr 18 02:50:50 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* yarvcore.c (th_init2): push initial blockptr value for
+	  rb_block_given_p() outside ruby_exec().  [ruby-core:10923]
+
 Wed Apr 18 02:30:24 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (LDFLAGS): prepend -L. instead appending it to
diff --git a/yarvcore.c b/yarvcore.c
index 75a37b6952..d8d332f9e7 100644
--- a/yarvcore.c
+++ b/yarvcore.c
@@ -318,9 +318,10 @@ th_init2(rb_thread_t *th)
     th->cfp--;
 
     th->cfp->pc = 0;
-    th->cfp->sp = th->stack;
+    th->cfp->sp = th->stack + 1;
     th->cfp->bp = 0;
     th->cfp->lfp = th->stack;
+    *th->cfp->lfp = 0;
     th->cfp->dfp = th->stack;
     th->cfp->self = Qnil;
     th->cfp->magic = 0;