2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d99f0a58e2..bfca7255c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov  9 03:15:22 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (BEGIN_CALLARGS): ruby_block may be NULL even when
+	  ITER_PRE.
+
 Tue Nov  7 18:34:34 2006  Akinori MUSHA  <knu@iDaemons.org>
 
 	* ext/digest/lib/digest/hmac.rb: Keep this out of the 1.8 tree
diff --git a/eval.c b/eval.c
index 17cd585333..6b9a674a16 100644
--- a/eval.c
+++ b/eval.c
@@ -2262,7 +2262,7 @@ copy_node_scope(node, rval)
     int tmp_iter = ruby_iter->iter;\
     switch (tmp_iter) {\
       case ITER_PRE:\
-	ruby_block = ruby_block->outer;\
+	if (ruby_block) ruby_block = ruby_block->outer;\
       case ITER_PAS:\
 	tmp_iter = ITER_NOT;\
     }\