From d38ce438285e1414eb0511baa2ed46840c5c34e7 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Fri, 8 Jun 2007 08:55:21 +0000 Subject: * eval.c (rb_eval_cmd): just return if no exceptions. [ruby-dev:30820] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@12485 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ eval.c | 4 ++++ version.h | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b5e65e87a..0c86195d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed May 30 05:17:55 2007 Nobuyoshi Nakada + + * 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 * eval.c (thread_timer): timer thread should not receive any diff --git a/eval.c b/eval.c index ccb25c84f..014ee9d9d 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 6fab0e5a0..56da95fb2 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 -- cgit