mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

GP-0: Fixed potential NPE in ImageCor20Header.java (Closes #2246)

Browse Source
This commit is contained in:
Ryan Kurtz
2026-06-23 07:25:17 -04:00
parent 3e9b429513
commit 082f7fe96b
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/ImageCor20Header.java
View File

@@ -19,7 +19,7 @@ import java.io.IOException;
import ghidra.app.util.bin.BinaryReader; import ghidra.app.util.bin.BinaryReader;
import ghidra.app.util.bin.StructConverter; import ghidra.app.util.bin.StructConverter;
import ghidra.app.util.bin.format.pe.cli.CliMetadataDirectory; import ghidra.app.util.bin.format.pe.cli.*;
import ghidra.app.util.bin.format.pe.cli.streams.CliStreamMetadata; import ghidra.app.util.bin.format.pe.cli.streams.CliStreamMetadata;
import ghidra.app.util.bin.format.pe.cli.tables.CliTableMethodDef.CliMethodDefRow; import ghidra.app.util.bin.format.pe.cli.tables.CliTableMethodDef.CliMethodDefRow;
import ghidra.app.util.importer.MessageLog; import ghidra.app.util.importer.MessageLog;
@@ -142,10 +142,11 @@ public class ImageCor20Header implements StructConverter, PeMarkupable {
} }
else { else {
// Add a new symbol for the .NET entry point // Add a new symbol for the .NET entry point
CliStreamMetadata stream = (CliStreamMetadata) metadata.getMetadataRoot() CliMetadataRoot metadataRoot = metadata.getMetadataRoot();
.getStreamHeader(CliStreamMetadata.getName()) CliStreamHeader streamHeader =
.getStream(); metadataRoot.getStreamHeader(CliStreamMetadata.getName());
if (streamHeader != null) {
CliStreamMetadata stream = (CliStreamMetadata) streamHeader.getStream();
CliMethodDefRow row = CliMethodDefRow row =
(CliMethodDefRow) stream.getTable((entryPointToken & 0xff000000) >> 24) (CliMethodDefRow) stream.getTable((entryPointToken & 0xff000000) >> 24)
.getRow(entryPointToken & 0x00ffffff); .getRow(entryPointToken & 0x00ffffff);
@@ -156,6 +157,7 @@ public class ImageCor20Header implements StructConverter, PeMarkupable {
entryPointVA = program.getImageBase().add(row.RVA); entryPointVA = program.getImageBase().add(row.RVA);
} }
} }
}
catch (Exception e) { catch (Exception e) {
log.appendException(e); log.appendException(e);
} }