summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-31 20:19:44 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-31 20:19:44 +0000
commit132d0624ec5b59d2d55fc0ccf01b53c10010d787 (patch)
treece6815b5b38f42d01cb6680647d5ca7888c2cda2
parentcd350b676813f8313e9bc3c3289f1209b04e4299 (diff)
* variable.c (rb_const_get_0), vm_insnhelper.c (vm_get_ev_const):
avoids infinite self recursion autoload. [ruby-core:21696] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21925 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--bootstraptest/test_autoload.rb8
-rw-r--r--variable.c3
-rw-r--r--version.h6
-rw-r--r--vm_insnhelper.c3
5 files changed, 22 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d89d5421f01..3bc2b0378d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb 1 05:19:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * variable.c (rb_const_get_0), vm_insnhelper.c (vm_get_ev_const):
+ avoids infinite self recursion autoload. [ruby-core:21696]
+
Sat Jan 31 22:50:38 2009 Tanaka Akira <akr@fsij.org>
* lib/test/unit/assertions.rb (assert_equal): show class in failure
diff --git a/bootstraptest/test_autoload.rb b/bootstraptest/test_autoload.rb
index 048256170ea..395153f4385 100644
--- a/bootstraptest/test_autoload.rb
+++ b/bootstraptest/test_autoload.rb
@@ -59,3 +59,11 @@ assert_equal 'okok', %q{
[t1.value, t2.value].join
}
+assert_finish 5, %q{
+ autoload :ZZZ, File.expand_path(__FILE__)
+ begin
+ ZZZ
+ rescue NameError
+ end
+}, '[ruby-core:21696]'
+
diff --git a/variable.c b/variable.c
index 0cc87d7fd34..b920c6797d1 100644
--- a/variable.c
+++ b/variable.c
@@ -1470,8 +1470,11 @@ rb_const_get_0(VALUE klass, ID id, int exclude, int recurse)
tmp = klass;
retry:
while (RTEST(tmp)) {
+ VALUE am = 0;
while (RCLASS_IV_TBL(tmp) && st_lookup(RCLASS_IV_TBL(tmp),id,&value)) {
if (value == Qundef) {
+ if (am == tmp) break;
+ am = tmp;
rb_autoload_load(tmp, id);
continue;
}
diff --git a/version.h b/version.h
index 929aa0bec14..90dd7fd0890 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1"
-#define RUBY_RELEASE_DATE "2009-01-31"
+#define RUBY_RELEASE_DATE "2009-02-01"
#define RUBY_PATCHLEVEL 5000
#define RUBY_BRANCH_NAME "trunk"
@@ -7,8 +7,8 @@
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2009
-#define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 31
+#define RUBY_RELEASE_MONTH 2
+#define RUBY_RELEASE_DAY 1
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 7b4fd37979a..0e54dddc599 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -1082,10 +1082,13 @@ vm_get_ev_const(rb_thread_t *th, const rb_iseq_t *iseq,
cref = cref->nd_next;
if (!NIL_P(klass)) {
+ VALUE am = 0;
search_continue:
if (RCLASS_IV_TBL(klass) &&
st_lookup(RCLASS_IV_TBL(klass), id, &val)) {
if (val == Qundef) {
+ if (am == klass) break;
+ am = klass;
rb_autoload_load(klass, id);
goto search_continue;
}