[Bf-blender-cvs] [b1bf8848895] blender-v3.0-release: Images: fix error in previous refactor

Jacques Lucke noreply at git.blender.org
Tue Nov 2 12:30:41 CET 2021


Commit: b1bf8848895bf4b35a14f89806f1f5807198e321
Author: Jacques Lucke
Date:   Tue Nov 2 12:26:42 2021 +0100
Branches: blender-v3.0-release
https://developer.blender.org/rBb1bf8848895bf4b35a14f89806f1f5807198e321

Images: fix error in previous refactor

Some compositor tests (e.g. `compositor_color_test`) broke
because of rB0c3b215e7d5456878b155d13440864f49ad1f230.
The issue was a heap-use-after-free bug caused by a missing
call to `MEM_CacheLimiter_unmanage`.

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

M	source/blender/imbuf/intern/moviecache.c

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

diff --git a/source/blender/imbuf/intern/moviecache.c b/source/blender/imbuf/intern/moviecache.c
index 8d0f55f5007..6e7b85a300a 100644
--- a/source/blender/imbuf/intern/moviecache.c
+++ b/source/blender/imbuf/intern/moviecache.c
@@ -122,8 +122,8 @@ static void moviecache_valfree(void *val)
 
   PRINT("%s: cache '%s' free item %p buffer %p\n", __func__, cache->name, item, item->ibuf);
 
+  MEM_CacheLimiter_unmanage(item->c_handle);
   if (item->ibuf) {
-    MEM_CacheLimiter_unmanage(item->c_handle);
     IMB_freeImBuf(item->ibuf);
   }



More information about the Bf-blender-cvs mailing list