[Bf-blender-cvs] [f4f468f] master: Fix sequencer crashing after recent GHash refactor.
Antony Riakiotakis
noreply at git.blender.org
Fri Feb 6 14:28:16 CET 2015
Commit: f4f468fc4830c32fc6423ff968cf1af86e8dcd16
Author: Antony Riakiotakis
Date: Fri Feb 6 14:28:08 2015 +0100
Branches: master
https://developer.blender.org/rBf4f468fc4830c32fc6423ff968cf1af86e8dcd16
Fix sequencer crashing after recent GHash refactor.
Code frees hash element while iterating - I don't think that's a good
idea but this should keep things working for now at least.
===================================================================
M source/blender/imbuf/intern/moviecache.c
===================================================================
diff --git a/source/blender/imbuf/intern/moviecache.c b/source/blender/imbuf/intern/moviecache.c
index 0708045..a068304 100644
--- a/source/blender/imbuf/intern/moviecache.c
+++ b/source/blender/imbuf/intern/moviecache.c
@@ -144,11 +144,15 @@ static void check_unused_keys(MovieCache *cache)
{
GHashIterator gh_iter;
- 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);
bool remove;
+ BLI_ghashIterator_step(&gh_iter);
+
remove = !item->ibuf;
if (remove) {
More information about the Bf-blender-cvs
mailing list