[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20645] trunk/blender/source/blender/ blenkernel/intern/softbody.c: coverity issues:

[Kent Mein]

Revision: 20645
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20645
Author:   sirdude
Date:     2009-06-05 06:15:19 +0200 (Fri, 05 Jun 2009)

Log Message:
-----------
coverity issues:
CID: 478
Checker: REVERSE_INULL (help)
File: base/src/source/blender/blenkernel/intern/softbody.c
Function: apply_spring_memory
Description: Pointer "sb" dereferenced before NULL check

and
CID: 480
Checker: REVERSE_INULL (help)
File: base/src/source/blender/blenkernel/intern/softbody.c
Function: springs_from_particles
Description: Pointer "ob" dereferenced before NULL check

again moved assignment after check to make sure pointer is valid.

Kent

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

Modified: trunk/blender/source/blender/blenkernel/intern/softbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/softbody.c	2009-06-05 03:52:24 UTC (rev 20644)
+++ trunk/blender/source/blender/blenkernel/intern/softbody.c	2009-06-05 04:15:19 UTC (rev 20645)
@@ -3075,8 +3075,8 @@
 	int a;
 	float b,l,r;
 
-    b = sb->plastic;
 	if (sb && sb->totspring){
+		b = sb->plastic;
 		for(a=0; a<sb->totspring; a++) {
 			bs  = &sb->bspring[a];
 			bp1 =&sb->bpoint[bs->v1];
@@ -3546,9 +3546,9 @@
 	int a,k;
 	float hairmat[4][4];
 
-	psys= ob->soft->particles;
-	sb= ob->soft;	
-	if(ob && sb && psys) { 	
+	if(ob && ob->soft && ob->soft->particles) { 	
+		psys= ob->soft->particles;
+		sb= ob->soft;	
 		psmd = psys_get_modifier(ob, psys);
 
 		bp= sb->bpoint;