From 132d0624ec5b59d2d55fc0ccf01b53c10010d787 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 31 Jan 2009 20:19:44 +0000
Subject: * 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
---
 variable.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'variable.c')

diff --git a/variable.c b/variable.c
index 0cc87d7fd3..b920c6797d 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;
 	    }
-- 
cgit v1.2.3