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

1 files changed, 7 insertions, 3 deletions

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 60559cc2d8d..6bcb1109480 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -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;
+					}
 				}
 			}
 		}