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

Merge remote-tracking branch

Browse Source 
'origin/GP-0_d-millar_index_error_revisited' (Closes #4353)
This commit is contained in:
Ryan Kurtz
2022-06-22 00:37:37 -04:00
parent d67bc4508c b6e2759d75
commit be4cf51f16
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/DumpFileLoader.java
+2 -1
View File
@@ -286,7 +286,8 @@ public class DumpFileLoader extends AbstractLibrarySupportLoader {
DataUtilities.ClearDataMode.CHECK_FOR_SPACE);
}
catch (CodeUnitInsertionException e) {
Msg.error(this, "Could not create " + dd.getDataType().getName() + " at " + address);
Msg.error(this,
"Could not create " + dd.getDataType().getName() + " at " + address);
}
monitor.setProgress(count++);
monitor.checkCanceled();
Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/CommentStreamA.java
+1 -2
View File
@@ -43,8 +43,8 @@ public class CommentStreamA implements StructConverter {
private void parse() throws IOException {
reader.setPointerIndex(index);
commentLength = reader.readNextInt();
comment = reader.readNextAsciiString();
commentLength = (int) (reader.getPointerIndex() - index);
}
@@ -54,7 +54,6 @@ public class CommentStreamA implements StructConverter {
public DataType toDataType() throws DuplicateNameException {
StructureDataType struct = new StructureDataType(NAME, 0);
struct.add(DWORD, 4, "CommentLength", null);
struct.add(ASCII, commentLength, "Comment", null);
return struct;
Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/CommentStreamW.java
+1 -2
View File
@@ -43,8 +43,8 @@ public class CommentStreamW implements StructConverter {
private void parse() throws IOException {
reader.setPointerIndex(index);
commentLength = reader.readNextInt();
comment = reader.readNextUnicodeString();
commentLength = (int) (reader.getPointerIndex() - index);
}
@@ -54,7 +54,6 @@ public class CommentStreamW implements StructConverter {
public DataType toDataType() throws DuplicateNameException {
StructureDataType struct = new StructureDataType(NAME, 0);
struct.add(DWORD, 4, "CommentLength", null);
struct.add(UTF16, commentLength, "Comment", null);
return struct;