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

Revert "Ghidra should not suppress exceptions from scripts"
cromulencellc · Oct 11, 2021 · 6724e05 · 6724e05
2 parents 4541e15 + 098d4b0
commit 6724e05
Showing 1 changed file with 12 additions and 4 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,8 +34,12 @@ 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;
-			filter.filterRead(spc, off, readLen, res);
-			filterEnabled = true;
+			try {
+				filter.filterRead(spc, off, readLen, res);
+			}
+			finally {
+				filterEnabled = true;
+			}
 		}
 		return readLen;
 	}
@@ -44,8 +48,12 @@ public int getChunk(byte[] res, AddressSpace spc, long off, int size,
 	public void setChunk(byte[] res, AddressSpace spc, long off, int size) {
 		if (filterEnabled && filter != null) {
 			filterEnabled = false;
-			filter.filterWrite(spc, off, size, res);
-			filterEnabled = true;
+			try {
+				filter.filterWrite(spc, off, size, res);
+			}
+			finally {
+				filterEnabled = true;
+			}
 		}
 		super.setChunk(res, spc, off, size);
 	}