Merge pull request #1 from cromulencellc/larkwiot-patch-1

Ghidra should not suppress exceptions from scripts
cromulencellc · Oct 7, 2021 · 8637096 · 8637096
2 parents 0aff588 + 7b02384
commit 8637096
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/emulator/FilteredMemoryState.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/emulator/FilteredMemoryState.java
@@ -34,12 +34,8 @@ public int getChunk(byte[] res, AddressSpace spc, long off, int size,
 		int readLen = super.getChunk(res, spc, off, size, stopOnUnintialized);
 		if (filterEnabled && filter != null) {
 			filterEnabled = false;
-			try {
-				filter.filterRead(spc, off, readLen, res);
-			}
-			finally {
-				filterEnabled = true;
-			}
+			filter.filterRead(spc, off, readLen, res);
+			filterEnabled = true;
 		}
 		return readLen;
 	}
@@ -49,12 +45,8 @@ public void setChunk(byte[] res, AddressSpace spc, long off, int size) {
 		super.setChunk(res, spc, off, size);
 		if (filterEnabled && filter != null) {
 			filterEnabled = false;
-			try {
-				filter.filterWrite(spc, off, size, res);
-			}
-			finally {
-				filterEnabled = true;
-			}
+			filter.filterWrite(spc, off, size, res);
+			filterEnabled = true;
 		}
 	}