Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-06-04 07:15:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'GP-0_ryanmkurtz_PR-5166_Gravelbones_omf_skip_comdat2'

Browse Source
This commit is contained in:
Ryan Kurtz
2023-03-28 07:59:15 -04:00
parent 25fd6c062f 216616ff8c
commit 1af765ef5c
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/omf/OmfFileHeader.java
+2 -4
View File
@@ -351,10 +351,8 @@ public class OmfFileHeader extends OmfRecord {
header.groups.add(group); header.groups.add(group);
} }
else if (record instanceof OmfFixupRecord fixuprec) { else if (record instanceof OmfFixupRecord fixuprec) {
if (lastDataBlock != null) { fixuprec.setDataBlock(lastDataBlock);
fixuprec.setDataBlock(lastDataBlock); header.fixup.add(fixuprec);
header.fixup.add(fixuprec);
}
} }
else if (record instanceof OmfEnumeratedData enumheader) { else if (record instanceof OmfEnumeratedData enumheader) {
header.addEnumeratedBlock(enumheader); header.addEnumeratedBlock(enumheader);
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/OmfLoader.java
+3
View File
@@ -198,6 +198,9 @@ public class OmfLoader extends AbstractProgramWrapperLoader {
int method, index, locationType = -1; int method, index, locationType = -1;
locAddress = null; locAddress = null;
if(fixup.getDataBlock() == null) {
continue; // If no data block don't try to fixup
}
try { try {
if (subrec.isTargetThread()) { if (subrec.isTargetThread()) {
Subrecord rec = targetThreads[subrec.getFixThreadNum()]; Subrecord rec = targetThreads[subrec.getFixThreadNum()];