GT-3252: Fixing infinite loop in MemoryBlockDB.putBytes (fixes NationalSecurityAgency#1149).

ryanmkurtz · ryanmkurtz · commit 083b5f61cc11 · 2019-10-23T11:27:57.000-04:00
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/mem/MemoryBlockDB.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/mem/MemoryBlockDB.java
@@ -477,7 +477,7 @@ private int putBytes(long offset, byte[] b, int off, int len) throws MemoryAcces
 		int totalCopied = 0;
 		try {
 			while (totalCopied < len) {
-				SubMemoryBlock subBlock = getSubBlock(offset);
+				SubMemoryBlock subBlock = getSubBlock(offset + totalCopied);
 				totalCopied += subBlock.putBytes(offset + totalCopied, b, off + totalCopied,
 					len - totalCopied);
 			}

Original file line number	Diff line number	Diff line change
`@@ -477,7 +477,7 @@ private int putBytes(long offset, byte[] b, int off, int len) throws MemoryAcces`
`477`	`477`	`int totalCopied = 0;`
`478`	`478`	`try {`
`479`	`479`	`while (totalCopied < len) {`
`480`		`- SubMemoryBlock subBlock = getSubBlock(offset);`
	`480`	`+ SubMemoryBlock subBlock = getSubBlock(offset + totalCopied);`
`481`	`481`	`totalCopied += subBlock.putBytes(offset + totalCopied, b, off + totalCopied,`
`482`	`482`	`len - totalCopied);`
`483`	`483`	`}`