diff --git a/core/packed_data_container.cpp b/core/packed_data_container.cpp index 0f8fff2d4218..7be91c6c2307 100644 --- a/core/packed_data_container.cpp +++ b/core/packed_data_container.cpp @@ -120,6 +120,7 @@ Variant PackedDataContainer::_get_at_ofs(uint32_t p_ofs, const uint8_t *p_buf, b uint32_t PackedDataContainer::_type_at_ofs(uint32_t p_ofs) const { PoolVector::Read rd = data.read(); + ERR_FAIL_COND_V(!rd.ptr(), 0); const uint8_t *r = &rd[p_ofs]; uint32_t type = decode_uint32(r); @@ -146,6 +147,10 @@ int PackedDataContainer::_size(uint32_t p_ofs) const { Variant PackedDataContainer::_key_at_ofs(uint32_t p_ofs, const Variant &p_key, bool &err) const { PoolVector::Read rd = data.read(); + if (!rd.ptr()) { + err = true; + ERR_FAIL_COND_V(!rd.ptr(), Variant()); + } const uint8_t *r = &rd[p_ofs]; uint32_t type = decode_uint32(r);