[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54946] trunk/blender/source/blender/ blenkernel/intern/movieclip.c: Fix own regression in commit from today -- missing NULL check

Sergey Sharybin sergey.vfx at gmail.com
Thu Feb 28 18:23:44 CET 2013


Revision: 54946
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54946
Author:   nazgul
Date:     2013-02-28 17:23:44 +0000 (Thu, 28 Feb 2013)
Log Message:
-----------
Fix own regression in commit from today -- missing NULL check

Crash happened when sequence image failed to load.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/movieclip.c

Modified: trunk/blender/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/movieclip.c	2013-02-28 16:37:19 UTC (rev 54945)
+++ trunk/blender/source/blender/blenkernel/intern/movieclip.c	2013-02-28 17:23:44 UTC (rev 54946)
@@ -227,9 +227,11 @@
 	ibuf = IMB_loadiffname(name, loadflag, colorspace);
 
 #ifdef WITH_OPENEXR
-	if (ibuf->ftype == OPENEXR && ibuf->userdata) {
-		IMB_exr_close(ibuf->userdata);
-		ibuf->userdata = NULL;
+	if (ibuf) {
+		if (ibuf->ftype == OPENEXR && ibuf->userdata) {
+			IMB_exr_close(ibuf->userdata);
+			ibuf->userdata = NULL;
+		}
 	}
 #endif
 




More information about the Bf-blender-cvs mailing list