godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add PackedDataContainer data pointer check for non nullable 

(cherry picked from commit 94d0c4182b)
This commit is contained in:
MaxStgs 2021-05-01 23:01:23 +05:00 committed by Rémi Verschelde
parent 7c5633c032
commit 7e22dfdd05
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/packed_data_container.cpp
View File

@ -128,6 +128,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 { uint32_t PackedDataContainer::_type_at_ofs(uint32_t p_ofs) const {
PoolVector<uint8_t>::Read rd = data.read(); PoolVector<uint8_t>::Read rd = data.read();
ERR_FAIL_COND_V(!rd.ptr(), 0);
const uint8_t *r = &rd[p_ofs]; const uint8_t *r = &rd[p_ofs];
uint32_t type = decode_uint32(r); uint32_t type = decode_uint32(r);
@ -158,6 +159,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 { Variant PackedDataContainer::_key_at_ofs(uint32_t p_ofs, const Variant &p_key, bool &err) const {
PoolVector<uint8_t>::Read rd = data.read(); PoolVector<uint8_t>::Read rd = data.read();
if (!rd.ptr()) {
err = true;
ERR_FAIL_COND_V(!rd.ptr(), Variant());
}
const uint8_t *r = &rd[p_ofs]; const uint8_t *r = &rd[p_ofs];
uint32_t type = decode_uint32(r); uint32_t type = decode_uint32(r);