[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26845] trunk/blender/source/blender/ editors/sculpt_paint/paint_image.c: bugfix [#21090] Crash because of slow USB drive

[Campbell Barton]

Revision: 26845
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26845
Author:   campbellbarton
Date:     2010-02-12 17:26:35 +0100 (Fri, 12 Feb 2010)

Log Message:
-----------
bugfix [#21090] Crash because of slow USB drive
missing NULL check

Modified Paths:
--------------
    trunk/blender/source/blender/editors/sculpt_paint/paint_image.c

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image.c	2010-02-12 15:33:32 UTC (rev 26844)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image.c	2010-02-12 16:26:35 UTC (rev 26845)
@@ -4079,7 +4079,10 @@
 	ImBuf *ibuf= BKE_image_get_ibuf(ima, s->sima? &s->sima->iuser: NULL);
 	
 	/* verify that we can paint and set canvas */
-	if(ima->packedfile && ima->rr) {
+	if(ima==NULL) {
+		return 0;
+	}
+	else if(ima->packedfile && ima->rr) {
 		s->warnpackedfile = ima->id.name + 2;
 		return 0;
 	}	
@@ -4087,7 +4090,7 @@
 		s->warnmultifile = ima->id.name + 2;
 		return 0;
 	}
-	else if(!ima || !ibuf || !(ibuf->rect || ibuf->rect_float))
+	else if(!ibuf || !(ibuf->rect || ibuf->rect_float))
 		return 0;
 
 	s->image= ima;
@@ -4410,7 +4413,7 @@
 	else {
 		pop->s.image = pop->s.sima->image;
 
-		if(!imapaint_canvas_set(&pop->s, pop->s.sima->image)) {
+		if(!imapaint_canvas_set(&pop->s, pop->s.image)) {
 			if(pop->s.warnmultifile)
 				BKE_report(op->reports, RPT_WARNING, "Image requires 4 color channels to paint");
 			if(pop->s.warnpackedfile)