Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-01-15 01:26:31 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-01-17 22:25:42 +0300
commit07aed404cfb2759f97c60b9f64d8a9392dabaf1a (patch)
treeae47bdb684d0fbc8928dd2c011ca24a7fbfcb0d7 /source/blender/makesdna/intern
parentd30cc1ea0b9ba64d8a1e22105528b6cb8077692c (diff)
Fix buffer overflow vulernability in thumbnail file reading.
Fixes CVE-2017-2908 from T52924. Differential Revision: https://developer.blender.org/D3001
Diffstat (limited to 'source/blender/makesdna/intern')
-rw-r--r--source/blender/makesdna/intern/dna_genfile.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c
index 181d01e04fc..dec93f97c6c 100644
--- a/source/blender/makesdna/intern/dna_genfile.c
+++ b/source/blender/makesdna/intern/dna_genfile.c
@@ -173,7 +173,9 @@ void DNA_sdna_free(SDNA *sdna)
MEM_freeN(sdna->structs);
#ifdef WITH_DNA_GHASH
- BLI_ghash_free(sdna->structs_map, NULL, NULL);
+ if (sdna->structs_map) {
+ BLI_ghash_free(sdna->structs_map, NULL, NULL);
+ }
#endif
MEM_freeN(sdna);