yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 17:59:46 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-5938_dev747368_sevenzip_bz2_getsize_npe'

Browse source
This commit is contained in:
Ryan Kurtz 2025-09-04 06:10:06 -04:00
commit f501ffccd2
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -401,8 +401,9 @@ public class SevenZipFileSystem extends AbstractFileSystem<ISimpleInArchiveItem>
// In our case, we only handle extract operations. // In our case, we only handle extract operations.
if (!currentItem.isFolder() && extractAskMode == ExtractAskMode.EXTRACT) { if (!currentItem.isFolder() && extractAskMode == ExtractAskMode.EXTRACT) {
try { try {
currentCacheEntryBuilder = fsService.createTempFile(currentItem.getSize()); long size = Objects.requireNonNullElse(currentItem.getSize(), -1L);
monitor.initialize(currentItem.getSize(), "Extracting " + currentName); currentCacheEntryBuilder = fsService.createTempFile(size);
monitor.initialize(size, "Extracting " + currentName);
} }
catch (IOException e) { catch (IOException e) {
throw new SevenZipException(e); throw new SevenZipException(e);