Merge pull request #13410 from s-hadinger/berry_set_solidified_fix

Berry prevent crash when setting static variable for solidified class
This commit is contained in:
s-hadinger 2021-10-19 20:56:09 +02:00 committed by GitHub
commit e7159c8c8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -346,10 +346,12 @@ bbool be_class_setmember(bvm *vm, bclass *o, bstring *name, bvalue *src)
{
bvalue v;
be_assert(name != NULL);
bclass * obj = class_member(vm, o, name, &v);
if (obj && !var_istype(&v, MT_VARIABLE)) {
be_map_insertstr(vm, obj->members, name, src);
return btrue;
if (!gc_isconst(o)) {
bclass * obj = class_member(vm, o, name, &v);
if (obj && !var_istype(&v, MT_VARIABLE)) {
be_map_insertstr(vm, obj->members, name, src);
return btrue;
}
}
return bfalse;
}