archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 21:49:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* variable.c (rb_autoload_load): checks if iv_tbl is valid.

Browse source 
[ruby-dev:38456]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-05-15 06:15:14 +00:00
parent f7c9c76769
commit f4a0a73175
3 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
variable.c
View file

@ -1432,11 +1432,23 @@ autoload_node(VALUE mod, ID id, int noload)
return 0;
}
static NODE *
autoload_node_ptr(VALUE mod, ID id)
{
struct st_table *tbl = RCLASS_IV_TBL(mod);
st_data_t val;
if (!tbl || !st_lookup(tbl, id, &val) || val != Qundef) {
return 0;
}
return autoload_node(mod, id, 0);
}
VALUE
rb_autoload_load(VALUE klass, ID id)
{
VALUE file;
NODE *load = autoload_node(klass, id, 0);
NODE *load = autoload_node_ptr(klass, id);
if (!load) return Qfalse;
file = load->nd_lit;
@ -1446,15 +1458,10 @@ rb_autoload_load(VALUE klass, ID id)
VALUE
rb_autoload_p(VALUE mod, ID id)
{
struct st_table *tbl = RCLASS_IV_TBL(mod);
st_data_t val;
NODE *load;
VALUE file;
NODE *load = autoload_node_ptr(mod, id);
if (!tbl || !st_lookup(tbl, id, &val) || val != Qundef) {
return Qnil;
}
load = autoload_node(mod, id, 0);
if (!load) return Qnil;
return load && (file = load->nd_lit) ? file : Qnil;
}