Commit: 7061d1e39fea7495e787a071b83757e3dc0d61a7
Author: Jesse Yurkovich
Date: Thu Nov 4 20:58:32 2021 -0700
Branches: master
https://developer.blender.org/rB7061d1e39fea7495e787a071b83757e3dc0d61a7
Fix T92740: Missing lock around the image CacheLimiter
A recent change exposed this long-standing race. Simply protect the
MEM_CacheLimiter with its lock now. Additionally, guard against
unmanaging an already destroyed cache handle.
Ref T92740, T92838
===================================================================
M source/blender/imbuf/intern/moviecache.c
===================================================================
diff --git a/source/blender/imbuf/intern/moviecache.c
b/source/blender/imbuf/intern/moviecache.c
index 6e7b85a300a..34c180ba1fb 100644
--- a/source/blender/imbuf/intern/moviecache.c
+++ b/source/blender/imbuf/intern/moviecache.c
@@ -122,7 +122,12 @@ 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);
+ BLI_mutex_lock(&limitor_lock);
+ if (item->c_handle) {
+ MEM_CacheLimiter_unmanage(item->c_handle);
+ }
+ BLI_mutex_unlock(&limitor_lock);
+
if (item->ibuf) {
IMB_freeImBuf(item->ibuf);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
