[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22292] branches/blender2.5/blender/source /blender/blenloader/intern/readfile.c: fix for crash while appending data.

[Campbell Barton]

Revision: 22292
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22292
Author:   campbellbarton
Date:     2009-08-07 07:25:17 +0200 (Fri, 07 Aug 2009)

Log Message:
-----------
fix for crash while appending data. (missing NULL check for newlibadr return 
value)

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c

Modified: 
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c     
2009-08-07 04:41:15 UTC (rev 22291)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c     
2009-08-07 05:25:17 UTC (rev 22292)
@@ -9363,10 +9363,14 @@
                        /* set new bump for unused slots */
                        for(a=0; a<MAX_MTEX; a++) {
                                if(ma->mtex[a]) {
-                                       if(!ma->mtex[a]->tex)
+                                       tex= ma->mtex[a]->tex;
+                                       if(!tex)
                                                ma->mtex[a]->texflag |= 
MTEX_NEW_BUMP;
-                                       else if(((Tex*)newlibadr(fd, 
ma->id.lib, ma->mtex[a]->tex))->type == 0)
-                                               ma->mtex[a]->texflag |= 
MTEX_NEW_BUMP;
+                                       else {
+                                               tex= (Tex*)newlibadr(fd, 
ma->id.lib, tex);
+                                               if(tex && tex->type == 0) /* 
invalid type */
+                                                       ma->mtex[a]->texflag |= 
MTEX_NEW_BUMP;
+                                       }
                                }
                        }
                }


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs