3 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b5e65e87aa..0c86195d49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 30 05:17:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_eval): get rid of SEGV at ZSUPER in a block
+	  [ruby-dev:30836]
+
 Wed May 30 04:29:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (thread_timer): timer thread should not receive any
diff --git a/eval.c b/eval.c
index ccb25c84fe..014ee9d9d3 100644
--- a/eval.c
+++ b/eval.c
@@ -3501,6 +3501,10 @@ rb_eval(self, n)
 		    }
 		    argv = RARRAY(RBASIC(ruby_scope)->klass)->ptr;
 		}
+		else if (!ruby_scope->local_vars) {
+		    argc = 0;
+		    argv = 0;
+		}
 		else {
 		    argv = ruby_scope->local_vars + 2;
 		}
diff --git a/version.h b/version.h
index 6fab0e5a0b..56da95fb2a 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2007-06-07"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20070607
-#define RUBY_PATCHLEVEL 34
+#define RUBY_PATCHLEVEL 35
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8