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

GP-7173: Limiting recursion depth in OmfIteratedData.java

Browse Source
This commit is contained in:
Ryan Kurtz
2026-08-31 07:10:33 -04:00
parent fef3f4c9a5
commit 6b40e4a239
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/omf/omf/OmfIteratedData.java
View File

@@ -40,7 +40,7 @@ public class OmfIteratedData extends OmfData {
dataOffset = OmfUtils.readInt2Or4(dataReader, hasBigFields); dataOffset = OmfUtils.readInt2Or4(dataReader, hasBigFields);
ArrayList<DataBlock> blocklist = new ArrayList<>(); ArrayList<DataBlock> blocklist = new ArrayList<>();
while (dataReader.getPointerIndex() < dataEnd) { while (dataReader.getPointerIndex() < dataEnd) {
DataBlock block = DataBlock.read(dataReader, hasBigFields); DataBlock block = DataBlock.read(dataReader, hasBigFields, 0);
blocklist.add(block); blocklist.add(block);
} }
datablock = new DataBlock[blocklist.size()]; datablock = new DataBlock[blocklist.size()];
@@ -84,12 +84,19 @@ public class OmfIteratedData extends OmfData {
* Contain the definition of one part of a datablock with possible recursion * Contain the definition of one part of a datablock with possible recursion
*/ */
public static class DataBlock { public static class DataBlock {
private static final int DEPTH_LIMIT = 100;
private int repeatCount; private int repeatCount;
private int blockCount; private int blockCount;
private byte[] simpleBlock = null; private byte[] simpleBlock = null;
private DataBlock[] nestedBlock = null; private DataBlock[] nestedBlock = null;
public static DataBlock read(BinaryReader reader, boolean hasBigFields) throws IOException { public static DataBlock read(BinaryReader reader, boolean hasBigFields, int depth)
throws IOException {
if (depth > DEPTH_LIMIT) {
throw new IOException("DataBlock read exceeded depth limit: " + DEPTH_LIMIT);
}
DataBlock subblock = new DataBlock(); DataBlock subblock = new DataBlock();
subblock.repeatCount = (int) OmfUtils.readInt2Or4(reader, hasBigFields).value(); subblock.repeatCount = (int) OmfUtils.readInt2Or4(reader, hasBigFields).value();
if (subblock.repeatCount < 0) { if (subblock.repeatCount < 0) {
@@ -106,7 +113,7 @@ public class OmfIteratedData extends OmfData {
else { else {
subblock.nestedBlock = new DataBlock[subblock.blockCount]; subblock.nestedBlock = new DataBlock[subblock.blockCount];
for (int i = 0; i < subblock.blockCount; ++i) { for (int i = 0; i < subblock.blockCount; ++i) {
subblock.nestedBlock[i] = read(reader, hasBigFields); // Recursive definition subblock.nestedBlock[i] = read(reader, hasBigFields, depth + 1); // Recursive definition
} }
} }
return subblock; return subblock;