[Bf-blender-cvs] [17604cd] master: Missing NULL-pointer check in BKE_image_free_anim_ibufs

Sergey Sharybin noreply at git.blender.org
Mon Dec 16 11:30:57 CET 2013


Commit: 17604cded975dcd765141cd1ca93c23d40b33484
Author: Sergey Sharybin
Date:   Mon Dec 16 16:30:28 2013 +0600
http://developer.blender.org/rB17604cded975dcd765141cd1ca93c23d40b33484

Missing NULL-pointer check in BKE_image_free_anim_ibufs

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

M	source/blender/blenkernel/intern/image.c

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

diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 1e55b5e..41b2b1d 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -985,7 +985,11 @@ static bool imagecache_check_free_anim(ImBuf *ibuf, void *UNUSED(userkey), void
 /* except_frame is weak, only works for seqs without offset... */
 void BKE_image_free_anim_ibufs(Image *ima, int except_frame)
 {
-	IMB_moviecache_cleanup(ima->cache, imagecache_check_free_anim, &except_frame);
+	BLI_spin_lock(&image_spin);
+	if (ima->cache != NULL) {
+		IMB_moviecache_cleanup(ima->cache, imagecache_check_free_anim, &except_frame);
+	}
+	BLI_spin_unlock(&image_spin);
 }
 
 void BKE_image_all_free_anim_ibufs(int cfra)




More information about the Bf-blender-cvs mailing list