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

Merge pull request #55189 from timothyqiu/packed-data-container

This commit is contained in:
Rémi Verschelde 2021-11-22 13:04:03 +01:00 committed by GitHub
parent 43f53f4e38 8253a45a1a
commit 608c029794
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/io/packed_data_container.cpp
View File

@ -100,6 +100,7 @@ Variant PackedDataContainer::_iter_get_ofs(const Variant &p_iter, uint32_t p_off
} }
Variant PackedDataContainer::_get_at_ofs(uint32_t p_ofs, const uint8_t *p_buf, bool &err) const { Variant PackedDataContainer::_get_at_ofs(uint32_t p_ofs, const uint8_t *p_buf, bool &err) const {
ERR_FAIL_COND_V(p_ofs + 4 > (uint32_t)data.size(), Variant());
uint32_t type = decode_uint32(p_buf + p_ofs); uint32_t type = decode_uint32(p_buf + p_ofs);
if (type == TYPE_ARRAY || type == TYPE_DICT) { if (type == TYPE_ARRAY || type == TYPE_DICT) {
@ -122,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 { uint32_t PackedDataContainer::_type_at_ofs(uint32_t p_ofs) const {
ERR_FAIL_COND_V(p_ofs + 4 > (uint32_t)data.size(), 0);
const uint8_t *rd = data.ptr(); const uint8_t *rd = data.ptr();
ERR_FAIL_COND_V(!rd, 0); ERR_FAIL_COND_V(!rd, 0);
const uint8_t *r = &rd[p_ofs]; const uint8_t *r = &rd[p_ofs];
@ -131,6 +133,7 @@ uint32_t PackedDataContainer::_type_at_ofs(uint32_t p_ofs) const {
} }
int PackedDataContainer::_size(uint32_t p_ofs) const { int PackedDataContainer::_size(uint32_t p_ofs) const {
ERR_FAIL_COND_V(p_ofs + 4 > (uint32_t)data.size(), 0);
const uint8_t *rd = data.ptr(); const uint8_t *rd = data.ptr();
ERR_FAIL_COND_V(!rd, 0); ERR_FAIL_COND_V(!rd, 0);
const uint8_t *r = &rd[p_ofs]; const uint8_t *r = &rd[p_ofs];
@ -149,6 +152,7 @@ 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 {
ERR_FAIL_COND_V(p_ofs + 4 > (uint32_t)data.size(), Variant());
const uint8_t *rd = data.ptr(); const uint8_t *rd = data.ptr();
if (!rd) { if (!rd) {
err = true; err = true;