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

Merge branch 'GP-3118_ryanmkurtz_PR-5016_Gravelbones_omf_fixes'

Browse Source 
(Closes #5016)
This commit is contained in:
Ryan Kurtz
2023-02-21 07:35:56 -05:00
parent 1533d7cefc 07aa5607f5
commit b3a7f0ba08
2 changed files with 11 additions and 6 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/OmfCommentRecord.java
+10 -5
View File
@@ -36,12 +36,17 @@ public class OmfCommentRecord extends OmfRecord {
readRecordHeader(reader); readRecordHeader(reader);
commentType = reader.readNextByte(); commentType = reader.readNextByte();
commentClass = reader.readNextByte(); commentClass = reader.readNextByte();
byte[] bytes = reader.readNextByteArray(
getRecordLength() - 3 /* 3 = sizeof(commentType+commentClass+trailing_crcbyte*/);
if (commentClass == COMMENT_CLASS_TRANSLATOR || commentClass == COMMENT_CLASS_LIBMOD || switch (commentClass) {
commentClass == COMMENT_CLASS_DEFAULT_LIBRARY) { case COMMENT_CLASS_TRANSLATOR:
value = new String(bytes, StandardCharsets.US_ASCII); // assuming ASCII case COMMENT_CLASS_DEFAULT_LIBRARY:
byte[] bytes = reader.readNextByteArray(getRecordLength() -
3 /* 3 = sizeof(commentType+commentClass+trailing_crcbyte*/);
value = new String(bytes, StandardCharsets.US_ASCII); // assuming ASCII
break;
case COMMENT_CLASS_LIBMOD:
value = readString(reader);
break;
} }
readCheckSumByte(reader); readCheckSumByte(reader);
} }
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/omf/OmfRecord.java
+1 -1
View File
@@ -247,6 +247,6 @@ public abstract class OmfRecord {
@Override @Override
public String toString() { public String toString() {
return String.format("name: %s, type: 0x%x, offset: 0x%x, length: 0x%x", return String.format("name: %s, type: 0x%x, offset: 0x%x, length: 0x%x",
getRecordName(recordType), recordType, recordOffset, recordLength); getRecordName(recordType & 0xfe), recordType, recordOffset, recordLength);
} }
} }