diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/commands/dyld/BindingTable.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/commands/dyld/BindingTable.java index f8ad444bd3..04a5b4d745 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/commands/dyld/BindingTable.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/commands/dyld/BindingTable.java @@ -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); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/commands/dyld/RebaseTable.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/commands/dyld/RebaseTable.java index a4c1aa32c8..92af5e5c29 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/commands/dyld/RebaseTable.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/commands/dyld/RebaseTable.java @@ -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); diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/bootldr/AndroidBootLoaderHeader.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/bootldr/AndroidBootLoaderHeader.java index efe2f95b74..0c601796c4 100644 --- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/bootldr/AndroidBootLoaderHeader.java +++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/bootldr/AndroidBootLoaderHeader.java @@ -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();