From ef1672aed04e55d677629e52dbfa76e36be747e9 Mon Sep 17 00:00:00 2001 From: dev747368 <48332326+dev747368@users.noreply.github.com> Date: Tue, 19 Apr 2022 18:52:52 +0000 Subject: [PATCH] GP-1944 fix zip file entry with empty name, github issue #4128 --- .../ghidra/file/formats/sevenzip/SevenZipFileSystem.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/sevenzip/SevenZipFileSystem.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/sevenzip/SevenZipFileSystem.java index b42e9d9cd6..580b51e126 100644 --- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/sevenzip/SevenZipFileSystem.java +++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/sevenzip/SevenZipFileSystem.java @@ -18,9 +18,10 @@ package ghidra.file.formats.sevenzip; import static ghidra.formats.gfilesystem.fileinfo.FileAttributeType.*; +import java.util.*; + import java.io.Closeable; import java.io.IOException; -import java.util.*; import org.apache.commons.io.FilenameUtils; @@ -124,6 +125,9 @@ public class SevenZipFileSystem implements GFileSystem { // use the name of the 7zip file itself, minus the extension itemPath = FilenameUtils.getBaseName(fsrl.getContainer().getName()); } + if (itemPath.isEmpty()) { + itemPath = ""; + } return itemPath; }