Merge pull request #48486 from MaxStgs/fix_packeddata_master

Add PackedDataContainer data pointer check for non nullable
godotengine · May 5, 2021 · 6fc14e5 · 6fc14e5
2 parents 7449d6c + d89d7ec
commit 6fc14e5
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/core/io/packed_data_container.cpp b/core/io/packed_data_container.cpp
@@ -123,6 +123,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 {
 	const uint8_t *rd = data.ptr();
+	ERR_FAIL_COND_V(!rd, 0);
 	const uint8_t *r = &rd[p_ofs];
 	uint32_t type = decode_uint32(r);
 
@@ -149,6 +150,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 {
 	const uint8_t *rd = data.ptr();
+	if (!rd) {
+		err = true;
+		ERR_FAIL_COND_V(!rd, Variant());
+	}
 	const uint8_t *r = &rd[p_ofs];
 	uint32_t type = decode_uint32(r);