[Bf-blender-cvs] [0e049e8] master: One more crashing instance for hashes

Antony Riakiotakis noreply at git.blender.org
Fri Feb 6 17:40:42 CET 2015


Commit: 0e049e88e2169b831bb829bbff358b593ed228b8
Author: Antony Riakiotakis
Date:   Fri Feb 6 17:39:26 2015 +0100
Branches: master
https://developer.blender.org/rB0e049e88e2169b831bb829bbff358b593ed228b8

One more crashing instance for hashes

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

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

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

diff --git a/source/blender/imbuf/intern/moviecache.c b/source/blender/imbuf/intern/moviecache.c
index a068304..29bb359 100644
--- a/source/blender/imbuf/intern/moviecache.c
+++ b/source/blender/imbuf/intern/moviecache.c
@@ -476,10 +476,14 @@ void IMB_moviecache_cleanup(MovieCache *cache, bool (cleanup_check_cb) (ImBuf *i
 
 	check_unused_keys(cache);
 
-	GHASH_ITER(gh_iter, cache->hash) {
+	BLI_ghashIterator_init(&gh_iter, cache->hash);
+
+	while (!BLI_ghashIterator_done(&gh_iter)) {
 		MovieCacheKey *key = BLI_ghashIterator_getKey(&gh_iter);
 		MovieCacheItem *item = BLI_ghashIterator_getValue(&gh_iter);
 
+		BLI_ghashIterator_step(&gh_iter);
+
 		if (cleanup_check_cb(item->ibuf, key->userkey, userdata)) {
 			PRINT("%s: cache '%s' remove item %p\n", __func__, cache->name, item);




More information about the Bf-blender-cvs mailing list