merges r24726 from trunk into ruby_1_9_1.

--
* vm_eval.c (eval_string_with_cref): fix to check local_table_size.
  [ruby-dev:39205] [Bug #2024]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25551 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 3008fddb1..ead886b15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep  1 19:56:28 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_eval.c (eval_string_with_cref): fix to check local_table_size.
+	  [ruby-dev:39205] [Bug #2024]
+
 Sun Aug 30 16:38:56 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (rb_enc_symname2_p): not depend on nul terminator.
diff --git a/version.h b/version.h
index d5c026164..260fdbd0e 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 309
+#define RUBY_PATCHLEVEL 310
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
diff --git a/vm_eval.c b/vm_eval.c
index 447232771..9c3a602af 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -754,7 +754,7 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, const char
 
 	/* save new env */
 	GetISeqPtr(iseqval, iseq);
-	if (bind && iseq->local_size > 0) {
+	if (bind && iseq->local_table_size > 0) {
 	    bind->env = rb_vm_make_env_object(th, th->cfp);
 	}