[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50988] trunk/blender/source/blender/ blenloader/intern/readfile.c: fix for unlikely crash if smoke collision data couldn't be read.

[Campbell Barton]

Revision: 50988
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50988
Author:   campbellbarton
Date:     2012-10-01 15:26:48 +0000 (Mon, 01 Oct 2012)
Log Message:
-----------
fix for unlikely crash if smoke collision data couldn't be read. (pointer was used before doing NULL check)

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2012-10-01 15:17:03 UTC (rev 50987)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2012-10-01 15:26:48 UTC (rev 50988)
@@ -4368,13 +4368,14 @@
 				smd->flow = NULL;
 				smd->domain = NULL;
 				smd->coll = newdataadr(fd, smd->coll);
-				smd->coll->smd = smd;
 				if (smd->coll) {
+					smd->coll->smd = smd;
 					smd->coll->points = NULL;
 					smd->coll->numpoints = 0;
 				}
-				else
+				else {
 					smd->type = 0;
+				}
 			}
 		}
 		else if (md->type == eModifierType_DynamicPaint) {