diff options
| author | Haoyu Qiu <timothyqiu32@gmail.com> | 2024-05-09 14:39:41 +0800 |
|---|---|---|
| committer | Haoyu Qiu <timothyqiu32@gmail.com> | 2024-05-09 14:41:35 +0800 |
| commit | a35ff3c73766b1accf03a2d2c76b12ed5f721302 (patch) | |
| tree | fcca7287cbbdcc951e817055d2dbe7632c9b07e0 /modules/astcenc | |
| parent | c4279fe3e0b27d0f40857c00eece7324a967285f (diff) | |
| download | redot-engine-a35ff3c73766b1accf03a2d2c76b12ed5f721302.tar.gz | |
Fix memory leak when ASTC compression fails
Diffstat (limited to 'modules/astcenc')
| -rw-r--r-- | modules/astcenc/image_compress_astcenc.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/astcenc/image_compress_astcenc.cpp b/modules/astcenc/image_compress_astcenc.cpp index 941c1f44be..499cf739c4 100644 --- a/modules/astcenc/image_compress_astcenc.cpp +++ b/modules/astcenc/image_compress_astcenc.cpp @@ -132,7 +132,10 @@ void _compress_astc(Image *r_img, Image::ASTCFormat p_format) { int dst_mip_w, dst_mip_h; int dst_ofs = Image::get_image_mipmap_offset_and_dimensions(width, height, target_format, i, dst_mip_w, dst_mip_h); // Ensure that mip offset is a multiple of 8 (etcpak expects uint64_t pointer). - ERR_FAIL_COND(dst_ofs % 8 != 0); + if (unlikely(dst_ofs % 8 != 0)) { + astcenc_context_free(context); + ERR_FAIL_MSG("astcenc: Mip offset is not a multiple of 8."); + } uint8_t *dest_mip_write = (uint8_t *)&dest_write[dst_ofs]; // Compress image. |