Prevent invalid memory access on invalid signature

nosoop · Sep 28, 2022 · 3096b79 · 3096b79
1 parent c0d399e
commit 3096b79
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/types/mempatch.cpp b/types/mempatch.cpp
@@ -35,7 +35,9 @@ class MemoryPatch {
 		for (auto bit : info.vecPreserve) {
 			this->vecPreserve.append(bit);
 		}
-		this->pAddress = pAddress + (info.offset);
+
+		// ignore offset if address is bad
+		this->pAddress = pAddress ? pAddress + (info.offset) : 0;
 	}
 
 	bool Enable() {
@@ -75,6 +77,10 @@ class MemoryPatch {
 	}
 
 	bool Verify() {
+		if (!pAddress) {
+			return false;
+		}
+
 		auto addr = (uint8_t*) pAddress;
 		for (size_t i = 0; i < this->vecVerify.length(); i++) {
 			if (vecVerify[i] != '*' && vecVerify[i] != addr[i]) {