1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't attempt to read ivars on T_ICLASS in struct (#5664)

Browse Source
This commit is contained in:
John Hawthorn 2022-05-26 11:54:15 -07:00 committed by GitHub
parent c3929b8c73
commit adc709adb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
Notes: git 2022-05-27 03:54:39 +09:00 
Merged-By: jhawthorn <john@hawthorn.email>
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
struct.c
View File

@ -43,13 +43,14 @@ struct_ivar_get(VALUE c, ID id)
return ivar;
for (;;) {
c = RCLASS_SUPER(c);
if (c == 0 || c == rb_cStruct)
return Qnil;
ivar = rb_attr_get(c, id);
if (!NIL_P(ivar)) {
return rb_ivar_set(orig, id, ivar);
}
c = rb_class_superclass(c);
if (c == 0 || c == rb_cStruct)
return Qnil;
RUBY_ASSERT(RB_TYPE_P(c, T_CLASS));
ivar = rb_attr_get(c, id);
if (!NIL_P(ivar)) {
return rb_ivar_set(orig, id, ivar);
}
}
}