From db2cd6ba5ab96b6e9e855d41246c9c24b25aaabf Mon Sep 17 00:00:00 2001 From: dev747368 <48332326+dev747368@users.noreply.github.com> Date: Thu, 25 Feb 2021 13:52:02 -0500 Subject: [PATCH] GP-730 Fix SevenZipFileSystem to error correctly w/encrypted file --- .../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 912f6b3088..ae4d47fdc9 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 @@ -15,9 +15,10 @@ */ package ghidra.file.formats.sevenzip; -import java.io.*; import java.util.*; +import java.io.*; + import org.apache.commons.io.FilenameUtils; import ghidra.formats.gfilesystem.*; @@ -261,6 +262,9 @@ public class SevenZipFileSystem implements GFileSystem { case UNKNOWN_OPERATION_RESULT: { throw new IOException("Unexpected: 7-Zip returned unknown operation result"); } + case WRONG_PASSWORD: { + throw new IOException("7-Zip wrong password"); + } case OK: default: { // it's all ok!