Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-02-08 03:30:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-2713_dev747368_sevenzip_fs_initialization--SQUASHED' into Ghidra_10.2

Browse Source
This commit is contained in:
ghidra1 2022-10-19 12:40:56 -04:00
commit 2308e467cd
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/sevenzip/SevenZipFileSystem.java
View File

@ -73,9 +73,11 @@ public class SevenZipFileSystem implements GFileSystem {
*/
public void mount(ByteProvider byteProvider, TaskMonitor monitor)
throws CancelledException, IOException {
if (!SevenZipFileSystemFactory.initNativeLibraries()) {
throw new IOException("Could not initialize 7zip native libraries");
}
try {
szBPStream = new SZByteProviderStream(byteProvider);
SevenZip.initSevenZipFromPlatformJAR(); // calling this multiple times is ok
archive = SevenZip.openInArchive(null, szBPStream);
archiveFormat = archive.getArchiveFormat();
archiveInterface = archive.getSimpleInterface();
@ -84,7 +86,7 @@ public class SevenZipFileSystem implements GFileSystem {
indexFiles(monitor);
ensurePasswords(monitor);
}
catch (SevenZipException | SevenZipNativeInitializationException e) {
catch (SevenZipException e) {
throw new IOException("Failed to open archive: " + fsrl, e);
}
}