Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-30 04:56:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-5457_dev747368_fix_gnunote_conflict'

Browse Source
This commit is contained in:
Ryan Kurtz
2025-03-07 05:54:49 -05:00
parent 7055edf3fa 017cef88cd
commit 2896551d68
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/info/StandardElfInfoProducer.java
+6 -3
View File
@@ -26,7 +26,7 @@ import ghidra.program.model.address.Address;
import ghidra.program.model.address.AddressOutOfBoundsException; import ghidra.program.model.address.AddressOutOfBoundsException;
import ghidra.program.model.data.*; import ghidra.program.model.data.*;
import ghidra.program.model.data.DataUtilities.ClearDataMode; import ghidra.program.model.data.DataUtilities.ClearDataMode;
import ghidra.program.model.listing.CodeUnit; import ghidra.program.model.listing.CommentType;
import ghidra.program.model.listing.Program; import ghidra.program.model.listing.Program;
import ghidra.program.model.mem.Memory; import ghidra.program.model.mem.Memory;
import ghidra.program.model.mem.MemoryBlock; import ghidra.program.model.mem.MemoryBlock;
@@ -133,16 +133,19 @@ public class StandardElfInfoProducer implements ElfInfoProducer {
br.align(4); // fix any notes with non-aligned size payloads br.align(4); // fix any notes with non-aligned size payloads
long noteLength = br.getPointerIndex() - start; long noteLength = br.getPointerIndex() - start;
if (DataUtilities.isUndefinedData(program, noteAddr)) {
try { try {
StructureDataType struct = note.toStructure(program.getDataTypeManager()); StructureDataType struct = note.toStructure(program.getDataTypeManager());
DataUtilities.createData(program, noteAddr, struct, -1, false, DataUtilities.createData(program, noteAddr, struct, -1, false,
ClearDataMode.CLEAR_ALL_UNDEFINED_CONFLICT_DATA); ClearDataMode.CLEAR_ALL_UNDEFINED_CONFLICT_DATA);
String comment = String comment =
"ELF Note \"%s\", %xh".formatted(note.getName(), note.getVendorType()); "ELF Note \"%s\", %xh".formatted(note.getName(), note.getVendorType());
program.getListing().setComment(noteAddr, CodeUnit.EOL_COMMENT, comment); program.getListing().setComment(noteAddr, CommentType.EOL, comment);
} }
catch (CodeUnitInsertionException e) { catch (CodeUnitInsertionException e) {
elfLoadHelper.log("Failed to markup ELF Note at " + noteAddr + ": data conflict"); elfLoadHelper
.log("Failed to markup ELF Note at " + noteAddr + ": data conflict");
}
} }
noteAddr = noteAddr.add(noteLength); noteAddr = noteAddr.add(noteLength);