From 82979d5ab57217502b34977b5e5e82895bd66dbb Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 19 Mar 2012 20:47:17 +0000 Subject: Fix #30590: Crash in multires when undoing extrude [File incl.] - Crash was caused by recursively copying directory into itself, fixed by switching from opendir() to scandir(). - Also do not try to unpack images which doesn't have name. --- source/blender/blenkernel/intern/packedFile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/blenkernel/intern/packedFile.c') diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c index aaf15d683d8..4230510dac9 100644 --- a/source/blender/blenkernel/intern/packedFile.c +++ b/source/blender/blenkernel/intern/packedFile.c @@ -497,7 +497,7 @@ int unpackImage(ReportList *reports, Image *ima, int how) char *newname; int ret_value = RET_ERROR; - if (ima != NULL) { + if (ima != NULL && ima->name[0]) { BLI_strncpy(localname, ima->name, sizeof(localname)); BLI_splitdirstring(localname, fi); BLI_snprintf(localname, sizeof(localname), "//textures/%s", fi); -- cgit v1.2.3