Commit: c82e9d4ec81c5119b4bf0a211f89273dc3ede9b4 Author: Campbell Barton Date: Sat Jul 16 16:32:36 2022 +1000 Branches: blender-v3.2-release https://developer.blender.org/rBc82e9d4ec81c5119b4bf0a211f89273dc3ede9b4
Fix T99744: NULL pointer free with corrupt zSTD reading =================================================================== M source/blender/blenlib/intern/filereader_zstd.c =================================================================== diff --git a/source/blender/blenlib/intern/filereader_zstd.c b/source/blender/blenlib/intern/filereader_zstd.c index 5f114f24fb0..aeb000e9754 100644 --- a/source/blender/blenlib/intern/filereader_zstd.c +++ b/source/blender/blenlib/intern/filereader_zstd.c @@ -281,7 +281,10 @@ static void zstd_close(FileReader *reader) if (zstd->reader.seek) { MEM_freeN(zstd->seek.uncompressed_ofs); MEM_freeN(zstd->seek.compressed_ofs); - MEM_freeN(zstd->seek.cached_content); + /* When an error has occurred this may be NULL, see: T99744. */ + if (zstd->seek.cached_content) { + MEM_freeN(zstd->seek.cached_content); + } } else { MEM_freeN((void *)zstd->in_buf.src); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs