diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-03-20 00:47:17 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-03-20 00:47:17 +0400 |
| commit | 82979d5ab57217502b34977b5e5e82895bd66dbb (patch) | |
| tree | a40ff580f11a497bff1a5e24efb90a3d3b4c10af /source/blender/blenkernel/intern/packedFile.c | |
| parent | fe4ba0a4626ec2b7ff62450c83b02b1e4424ee40 (diff) | |
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.
Diffstat (limited to 'source/blender/blenkernel/intern/packedFile.c')
| -rw-r--r-- | source/blender/blenkernel/intern/packedFile.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |