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

Fix PoolByteArray.decompress_dynamic return value and memleak 

(cherry picked from commit de47cb0c5b)
This commit is contained in:
Haoyu Qiu 2022-02-05 15:14:23 +08:00 committed by Rémi Verschelde
parent eb9a847566
commit 4ab57389a5
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/variant_call.cpp
View File

@ -652,17 +652,17 @@ struct _VariantCall {
static void _call_PoolByteArray_decompress_dynamic(Variant &r_ret, Variant &p_self, const Variant **p_args) { static void _call_PoolByteArray_decompress_dynamic(Variant &r_ret, Variant &p_self, const Variant **p_args) {
PoolByteArray *ba = reinterpret_cast<PoolByteArray *>(p_self._data._mem); PoolByteArray *ba = reinterpret_cast<PoolByteArray *>(p_self._data._mem);
PoolByteArray *decompressed = memnew(PoolByteArray); PoolByteArray decompressed;
int max_output_size = (int)(*p_args[0]); int max_output_size = (int)(*p_args[0]);
Compression::Mode mode = (Compression::Mode)(int)(*p_args[1]); Compression::Mode mode = (Compression::Mode)(int)(*p_args[1]);
decompressed->resize(1024); decompressed.resize(1024);
int result = Compression::decompress_dynamic(decompressed, max_output_size, ba->read().ptr(), ba->size(), mode); int result = Compression::decompress_dynamic(&decompressed, max_output_size, ba->read().ptr(), ba->size(), mode);
if (result == OK) { if (result == OK) {
r_ret = decompressed; r_ret = decompressed;
} else { } else {
decompressed->resize(0); decompressed.resize(0);
r_ret = decompressed; r_ret = decompressed;
ERR_FAIL_MSG("Decompression failed."); ERR_FAIL_MSG("Decompression failed.");
} }