mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-25 17:00:36 -09:00
Code Issues Packages Projects Releases Wiki Activity

GP-7174/7175: Fixing string formatter

Browse Source
This commit is contained in:
Ryan Kurtz
2026-08-31 07:02:26 -04:00
parent 0423f95d0f
commit fef3f4c9a5
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/commands/dyld/BindingTable.java
View File

@@ -147,7 +147,7 @@ public class BindingTable extends OpcodeTable {
ulebOffsets.add(reader.getPointerIndex() - origIndex);
long count = reader.readNext(LEB128::unsigned);
if (count < 0 || count > COUNT_LIMIT) {
throw new MachException("BIND_OPCODE count exceeds limit (%s): %s"
throw new MachException("BIND_OPCODE count exceeds limit (%d): %d"
.formatted(COUNT_LIMIT, count));
}
ulebOffsets.add(reader.getPointerIndex() - origIndex);

4
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/commands/dyld/RebaseTable.java
View File

@@ -100,7 +100,7 @@ public class RebaseTable extends OpcodeTable {
ulebOffsets.add(reader.getPointerIndex() - origIndex);
int count = reader.readNextUnsignedVarIntExact(LEB128::unsigned);
if (count < 0 || count > COUNT_LIMIT) {
throw new MachException("REBASE_OPCODE count exceeds limit (%s): %s"
throw new MachException("REBASE_OPCODE count exceeds limit (%d): %d"
.formatted(COUNT_LIMIT, count));
}
for (int i = 0; i < count; ++i) {
@@ -119,7 +119,7 @@ public class RebaseTable extends OpcodeTable {
ulebOffsets.add(reader.getPointerIndex() - origIndex);
int count = reader.readNextUnsignedVarIntExact(LEB128::unsigned);
if (count < 0 || count > COUNT_LIMIT) {
throw new MachException("REBASE_OPCODE count exceeds limit (%s): %s"
throw new MachException("REBASE_OPCODE count exceeds limit (%d): %d"
.formatted(COUNT_LIMIT, count));
}
ulebOffsets.add(reader.getPointerIndex() - origIndex);

2
Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/bootldr/AndroidBootLoaderHeader.java
View File

@@ -42,7 +42,7 @@ public class AndroidBootLoaderHeader implements StructConverter {
magic = reader.readNextAsciiString(AndroidBootLoaderConstants.BOOTLDR_MAGIC_SIZE);
numberOfImages = reader.readNextInt();
if (numberOfImages < 0 || numberOfImages > NUM_IMAGES_LIMIT) {
throw new IOException("Image count exceeds limit (%s): %s"
throw new IOException("Image count exceeds limit (%d): %d"
.formatted(NUM_IMAGES_LIMIT, numberOfImages));
}
startOffset = reader.readNextInt();