archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

fix for crash while appending data. (missing NULL check for newlibadr return value)

Browse Source
This commit is contained in:
Campbell Barton
2009-08-07 05:25:17 +00:00
parent bc093b4cc4
commit db0b490e29
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenloader/intern/readfile.c
View File

@@ -9363,10 +9363,14 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
/* set new bump for unused slots */
for(a=0; a<MAX_MTEX; a++) {
if(ma->mtex[a]) {
if(!ma->mtex[a]->tex)
ma->mtex[a]->texflag |= MTEX_NEW_BUMP;
else if(((Tex*)newlibadr(fd, ma->id.lib, ma->mtex[a]->tex))->type == 0)
tex= ma->mtex[a]->tex;
if(!tex)
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;
}
}
}
}