[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20390] trunk/blender/source/blender/ blenloader/intern/readfile.c: missing null check, would crash blender when loading some files
Campbell Barton
ideasman42 at gmail.com
Mon May 25 02:31:42 CEST 2009
Revision: 20390
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20390
Author: campbellbarton
Date: 2009-05-25 02:31:41 +0200 (Mon, 25 May 2009)
Log Message:
-----------
missing null check, would crash blender when loading some files
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 2009-05-25 00:30:06 UTC (rev 20389)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2009-05-25 00:31:41 UTC (rev 20390)
@@ -8116,11 +8116,13 @@
/* check if top parent has compound shape set and if yes, set this object
to compound shaper as well (was the behaviour before, now it's optional) */
Object *parent= newlibadr(fd, lib, ob->parent);
- while (parent->parent != NULL) {
- parent = newlibadr(fd, lib, parent->parent);
+ if(parent) {
+ while (parent->parent != NULL) {
+ parent = newlibadr(fd, lib, parent->parent);
+ }
+ if (parent->gameflag & OB_CHILD)
+ ob->gameflag |= OB_CHILD;
}
- if (parent->gameflag & OB_CHILD)
- ob->gameflag |= OB_CHILD;
}
}
for(wrld=main->world.first; wrld; wrld= wrld->id.next) {
More information about the Bf-blender-cvs
mailing list