[Bf-blender-cvs] [aa0242170ad] master: BLI_memiter: unpoison memory before freeing it

Jacques Lucke noreply at git.blender.org
Wed May 22 12:33:56 CEST 2019


Commit: aa0242170add738431cec4b212a7ce87e06588e3
Author: Jacques Lucke
Date:   Wed May 22 12:33:15 2019 +0200
Branches: master
https://developer.blender.org/rBaa0242170add738431cec4b212a7ce87e06588e3

BLI_memiter: unpoison memory before freeing it

===================================================================

M	source/blender/blenlib/intern/BLI_memiter.c

===================================================================

diff --git a/source/blender/blenlib/intern/BLI_memiter.c b/source/blender/blenlib/intern/BLI_memiter.c
index c7df7d5fdd4..2d3ba56d08e 100644
--- a/source/blender/blenlib/intern/BLI_memiter.c
+++ b/source/blender/blenlib/intern/BLI_memiter.c
@@ -239,6 +239,10 @@ static void memiter_free_data(BLI_memiter *mi)
   BLI_memiter_chunk *chunk = mi->head;
   while (chunk) {
     BLI_memiter_chunk *chunk_next = chunk->next;
+
+    /* Unpoison memory because MEM_freeN might overwrite it. */
+    ASAN_UNPOISON_MEMORY_REGION(chunk, MEM_allocN_len(chunk));
+
     MEM_freeN(chunk);
     chunk = chunk_next;
   }



More information about the Bf-blender-cvs mailing list