Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-31 13:36:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

GP-0 corrected NaP pointer operand rendering

Browse Source
This commit is contained in:
ghidra1
2022-05-09 15:16:07 -04:00
parent 3b09371ba8
commit f2510e4dc8
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/PointerDataType.java
+10 -7
View File
@@ -402,9 +402,8 @@ public class PointerDataType extends BuiltIn implements Pointer {
signedOffset = true; signedOffset = true;
} }
Long offset = getStoredOffset(buf, size, signedOffset); Long offset = getStoredOffset(buf, size, signedOffset, errorHandler);
if (offset == null) { if (offset == null) {
errorHandler.accept("Insufficient data");
return null; return null;
} }
@@ -541,9 +540,14 @@ public class PointerDataType extends BuiltIn implements Pointer {
* @param signed true if signed offset or false for unsigned * @param signed true if signed offset or false for unsigned
* @return stored offset value or null if unusable buf or data * @return stored offset value or null if unusable buf or data
*/ */
private static Long getStoredOffset(MemBuffer buf, int size, boolean signed) { private static Long getStoredOffset(MemBuffer buf, int size, boolean signed,
Consumer<String> errorHandler) {
byte[] bytes = new byte[size]; byte[] bytes = new byte[size];
if (buf.getBytes(bytes, 0) != size) { int cnt = buf.getBytes(bytes, 0);
if (cnt != size) {
if (cnt != 0 && errorHandler != null) {
errorHandler.accept("Insufficient data");
}
return null; return null;
} }
DataConverter converter = DataConverter.getInstance(buf.isBigEndian()); DataConverter converter = DataConverter.getInstance(buf.isBigEndian());
@@ -569,10 +573,9 @@ public class PointerDataType extends BuiltIn implements Pointer {
return null; return null;
} }
Long offset = getStoredOffset(buf, size, false); Long offset = getStoredOffset(buf, size, false, null);
if (offset == null) { if (offset == null) {
// Insufficient bytes return null; // Insufficient bytes
return null;
} }
if (targetSpace instanceof SegmentedAddressSpace) { if (targetSpace instanceof SegmentedAddressSpace) {