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

Merge pull request #96198 from DeeJayLSP/qoa-leak 

ResourceImporterWAV: Fix memory leak on QOA import
This commit is contained in:
Rémi Verschelde 2024-08-28 13:14:27 +02:00
parent 60765bebe4 e67cc73463
commit 5a11abc899
No known key found for this signature in database
GPG Key ID: C3336907360768E1
4 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
editor/import/resource_importer_wav.cpp
View File

@ -517,16 +517,19 @@ Error ResourceImporterWAV::import(const String &p_source_file, const String &p_s
Vector<uint8_t> dst_data; Vector<uint8_t> dst_data;
if (compression == 2) { if (compression == 2) {
dst_format = AudioStreamWAV::FORMAT_QOA; dst_format = AudioStreamWAV::FORMAT_QOA;
qoa_desc desc = { 0, 0, 0, { { { 0 }, { 0 } } } }; qoa_desc desc = {};
uint32_t qoa_len = 0; uint32_t qoa_len = 0;
desc.samplerate = rate; desc.samplerate = rate;
desc.samples = frames; desc.samples = frames;
desc.channels = format_channels; desc.channels = format_channels;
void *encoded = qoa_encode((short *)pcm_data.ptrw(), &desc, &qoa_len); void *encoded = qoa_encode((short *)pcm_data.ptr(), &desc, &qoa_len);
dst_data.resize(qoa_len); if (encoded) {
memcpy(dst_data.ptrw(), encoded, qoa_len); dst_data.resize(qoa_len);
memcpy(dst_data.ptrw(), encoded, qoa_len);
QOA_FREE(encoded);
}
} else { } else {
dst_data = pcm_data; dst_data = pcm_data;
} }

4
thirdparty/README.md vendored
View File

@ -692,8 +692,8 @@ Collection of single-file libraries used in Godot components.
* License: MIT * License: MIT
- `qoa.h` - `qoa.h`
* Upstream: https://github.com/phoboslab/qoa * Upstream: https://github.com/phoboslab/qoa
* Version: git (5c2a86d615661f34636cf179abf4fa278d3257e0, 2024) * Version: git (e0c69447d4d3945c3c92ac1751e4cdc9803a8303, 2024)
* Modifications: Inlined functions, patched uninitialized variables and untyped mallocs. * Modifications: Added a few modifiers to comply with C++ nature.
* License: MIT * License: MIT
- `r128.{c,h}` - `r128.{c,h}`
* Upstream: https://github.com/fahickman/r128 * Upstream: https://github.com/fahickman/r128

14
thirdparty/misc/patches/qoa-min-fix.patch vendored
View File

@ -1,5 +1,5 @@
diff --git a/qoa.h b/qoa.h diff --git a/qoa.h b/qoa.h
index 592082933a..c890b88bd6 100644 index cfed266bef..23612bb0bf 100644
--- a/qoa.h --- a/qoa.h
+++ b/qoa.h +++ b/qoa.h
@@ -140,14 +140,14 @@ typedef struct { @@ -140,14 +140,14 @@ typedef struct {
@ -24,19 +24,15 @@ index 592082933a..c890b88bd6 100644
#ifndef QOA_NO_STDIO #ifndef QOA_NO_STDIO
@@ -394,9 +394,9 @@ unsigned int qoa_encode_frame(const short *sample_data, qoa_desc *qoa, unsigned @@ -395,7 +395,7 @@ unsigned int qoa_encode_frame(const short *sample_data, qoa_desc *qoa, unsigned
#ifdef QOA_RECORD_TOTAL_ERROR
qoa_uint64_t best_error = -1; qoa_uint64_t best_error = -1;
#endif #endif
- qoa_uint64_t best_slice; qoa_uint64_t best_slice = 0;
- qoa_lms_t best_lms; - qoa_lms_t best_lms;
- int best_scalefactor; + qoa_lms_t best_lms = {};
+ qoa_uint64_t best_slice = -1; int best_scalefactor = 0;
+ qoa_lms_t best_lms = {{-1, -1, -1, -1}, {-1, -1, -1, -1}};
+ int best_scalefactor = -1;
for (int sfi = 0; sfi < 16; sfi++) { for (int sfi = 0; sfi < 16; sfi++) {
/* There is a strong correlation between the scalefactors of
@@ -500,7 +500,7 @@ void *qoa_encode(const short *sample_data, qoa_desc *qoa, unsigned int *out_len) @@ -500,7 +500,7 @@ void *qoa_encode(const short *sample_data, qoa_desc *qoa, unsigned int *out_len)
num_frames * QOA_LMS_LEN * 4 * qoa->channels + /* 4 * 4 bytes lms state per channel */ num_frames * QOA_LMS_LEN * 4 * qoa->channels + /* 4 * 4 bytes lms state per channel */
num_slices * 8 * qoa->channels; /* 8 byte slices */ num_slices * 8 * qoa->channels; /* 8 byte slices */

6
thirdparty/misc/qoa.h vendored
View File

@ -394,9 +394,9 @@ unsigned int qoa_encode_frame(const short *sample_data, qoa_desc *qoa, unsigned
#ifdef QOA_RECORD_TOTAL_ERROR #ifdef QOA_RECORD_TOTAL_ERROR
qoa_uint64_t best_error = -1; qoa_uint64_t best_error = -1;
#endif #endif
qoa_uint64_t best_slice = -1; qoa_uint64_t best_slice = 0;
qoa_lms_t best_lms = {{-1, -1, -1, -1}, {-1, -1, -1, -1}}; qoa_lms_t best_lms = {};
int best_scalefactor = -1; int best_scalefactor = 0;
for (int sfi = 0; sfi < 16; sfi++) { for (int sfi = 0; sfi < 16; sfi++) {
/* There is a strong correlation between the scalefactors of /* There is a strong correlation between the scalefactors of