[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32956] trunk/blender/source/blender/ quicktime/apple/quicktime_import.c: bugfix [#24578] crash on browse directory w/ broken image file

Campbell Barton ideasman42 at gmail.com
Tue Nov 9 04:52:27 CET 2010


Revision: 32956
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32956
Author:   campbellbarton
Date:     2010-11-09 04:52:27 +0100 (Tue, 09 Nov 2010)

Log Message:
-----------
bugfix [#24578] crash on browse directory w/ broken image file
Was trying to decode an image when quicktime wasn't initialized.

There are a few other reports on windows about thumbnails crashing which this probably fixes.

This also fixes a bug where DisposeHandle wasn't called if decode was called with a NULL pointer.

Modified Paths:
--------------
    trunk/blender/source/blender/quicktime/apple/quicktime_import.c

Modified: trunk/blender/source/blender/quicktime/apple/quicktime_import.c
===================================================================
--- trunk/blender/source/blender/quicktime/apple/quicktime_import.c	2010-11-09 03:37:51 UTC (rev 32955)
+++ trunk/blender/source/blender/quicktime/apple/quicktime_import.c	2010-11-09 03:52:27 UTC (rev 32956)
@@ -611,7 +611,7 @@
 	ImageDescriptionHandle		desc;
 
 	ComponentInstance			dataHandler;
-	PointerDataRef dataref = (PointerDataRef)NewHandle(sizeof(PointerDataRefRecord));
+	PointerDataRef dataref;
 
 	int x, y, depth;
 	int have_gw = FALSE;
@@ -634,11 +634,12 @@
 	unsigned char *from, *to;
 #endif
 
-	if (mem == NULL)
+	if (mem == NULL || !G.have_quicktime)
 		goto bail;
 	
 	if(QTIME_DEBUG) printf("qt: attempt to load mem as image\n");
 
+	dataref= (PointerDataRef)NewHandle(sizeof(PointerDataRefRecord));
 	(**dataref).data = mem;
 	(**dataref).dataLength = size;
 





More information about the Bf-blender-cvs mailing list