Merge pull request #55039 from BastiaanOlij/fix_gdnative_array_index

Fix array access in gdextensions
This commit is contained in:
Rémi Verschelde 2021-11-17 08:35:54 +01:00 committed by GitHub
commit 3c04522ece
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -774,13 +774,13 @@ static GDNativeTypePtr gdnative_packed_vector3_array_operator_index_const(const
static GDNativeVariantPtr gdnative_array_operator_index(GDNativeTypePtr p_self, GDNativeInt p_index) {
Array *self = (Array *)p_self;
ERR_FAIL_INDEX_V(p_index, self->size(), nullptr);
return (GDNativeTypePtr)&self[p_index];
return (GDNativeVariantPtr)&self->operator[](p_index);
}
static GDNativeVariantPtr gdnative_array_operator_index_const(const GDNativeTypePtr p_self, GDNativeInt p_index) {
const Array *self = (const Array *)p_self;
ERR_FAIL_INDEX_V(p_index, self->size(), nullptr);
return (GDNativeTypePtr)&self[p_index];
return (GDNativeVariantPtr)&self->operator[](p_index);
}
/* OBJECT API */