Prevent invalid memory access on invalid signature

nosoop · nosoop · commit 3096b797b972 · 2022-09-27T22:59:36.000-07:00
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]) {

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,9 @@ class MemoryPatch {`
`35`	`35`	`for (auto bit : info.vecPreserve) {`
`36`	`36`	`this->vecPreserve.append(bit);`
`37`	`37`	`}`
`38`		`- this->pAddress = pAddress + (info.offset);`
	`38`	`+`
	`39`	`+ // ignore offset if address is bad`
	`40`	`+ this->pAddress = pAddress ? pAddress + (info.offset) : 0;`
`39`	`41`	`}`
`40`	`42`
`41`	`43`	`bool Enable() {`
`@@ -75,6 +77,10 @@ class MemoryPatch {`
`75`	`77`	`}`
`76`	`78`
`77`	`79`	`bool Verify() {`
	`80`	`+ if (!pAddress) {`
	`81`	`+ return false;`
	`82`	`+ }`
	`83`	`+`
`78`	`84`	`auto addr = (uint8_t*) pAddress;`
`79`	`85`	`for (size_t i = 0; i < this->vecVerify.length(); i++) {`
`80`	`86`	`if (vecVerify[i] != '*' && vecVerify[i] != addr[i]) {`