[Bf-blender-cvs] [28d873f] master: Fix possible crash when cleaning cache with some ibufs removed by the memory limit

Sergey Sharybin noreply at git.blender.org
Mon Dec 16 15:39:44 CET 2013


Commit: 28d873f038ca67dd267e8939e5a32eedeb23cba8
Author: Sergey Sharybin
Date:   Mon Dec 16 20:38:53 2013 +0600
http://developer.blender.org/rB28d873f038ca67dd267e8939e5a32eedeb23cba8

Fix possible crash when cleaning cache with some ibufs removed by the memory limit

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

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

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

diff --git a/source/blender/imbuf/intern/moviecache.c b/source/blender/imbuf/intern/moviecache.c
index c287cf4..20e0169 100644
--- a/source/blender/imbuf/intern/moviecache.c
+++ b/source/blender/imbuf/intern/moviecache.c
@@ -454,7 +454,7 @@ void IMB_moviecache_cleanup(MovieCache *cache, bool (cleanup_check_cb) (ImBuf *i
 
 		BLI_ghashIterator_step(iter);
 
-		if (cleanup_check_cb(item->ibuf, key->userkey, userdata)) {
+		if (item->ibuf == NULL || cleanup_check_cb(item->ibuf, key->userkey, userdata)) {
 			PRINT("%s: cache '%s' remove item %p\n", __func__, cache->name, item);
 
 			BLI_ghash_remove(cache->hash, key, moviecache_keyfree, moviecache_valfree);




More information about the Bf-blender-cvs mailing list