diff --git a/ChangeLog b/ChangeLog
index 5ebf0b308a..4d9fc6d544 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jun 27 10:46:53 2006  Tanaka Akira  <akr@m17n.org>
+
+	* eval.c (rb_yield_0): avoid core dump.  [ruby-dev:28840]
+
 Mon Jun 26 11:03:00 2006  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/rdoc/ri: Add options to limit the ri search path.
diff --git a/eval.c b/eval.c
index ec1beb3acd..cca4c44c61 100644
--- a/eval.c
+++ b/eval.c
@@ -4740,7 +4740,10 @@ rb_yield_0(VALUE val, VALUE self, VALUE klass /* OK */, int flags)
 	    }
 	    else {
 		if (pcall) {
-		    val = RARRAY(val)->ptr[0];
+                    if (RARRAY(val)->len == 0)
+                        val = Qnil;
+                    else
+                        val = RARRAY(val)->ptr[0];
 		}
 		assign(self, var, val, pcall);
 	    }