getLastPointerFromPath - Make sure the address + the offset is valid before loading from it

Zephiles · Zephiles · commit 57e4b623bac8 · 2020-01-23T02:03:51.000-06:00
diff --git a/ttyd-tools/rel/source/commonfunctions.cpp b/ttyd-tools/rel/source/commonfunctions.cpp
@@ -317,9 +317,10 @@ void *getLastPointerFromPath(void *address, int32_t *offset, uint32_t offsetAmou
 	uint32_t Counter = 0;
 	for (uint32_t i = 0; i < (offsetAmount - 1); i++)
 	{
-		if (checkIfPointerIsValid(reinterpret_cast<void *>(tempAddress)))
+		uint32_t *tempAddress2 = reinterpret_cast<uint32_t *>(tempAddress + offset[i]);
+		if (checkIfPointerIsValid(tempAddress2))
 		{
-			tempAddress = *reinterpret_cast<uint32_t *>(tempAddress + offset[i]);
+			tempAddress = *tempAddress2;
 		}
 		else
 		{

Original file line number	Diff line number	Diff line change
`@@ -317,9 +317,10 @@ void getLastPointerFromPath(void address, int32_t *offset, uint32_t offsetAmou`
`317`	`317`	`uint32_t Counter = 0;`
`318`	`318`	`for (uint32_t i = 0; i < (offsetAmount - 1); i++)`
`319`	`319`	`{`
`320`		`- if (checkIfPointerIsValid(reinterpret_cast<void *>(tempAddress)))`
	`320`	`+ uint32_t tempAddress2 = reinterpret_cast<uint32_t >(tempAddress + offset[i]);`
	`321`	`+ if (checkIfPointerIsValid(tempAddress2))`
`321`	`322`	`{`
`322`		`- tempAddress = reinterpret_cast<uint32_t >(tempAddress + offset[i]);`
	`323`	`+ tempAddress = *tempAddress2;`
`323`	`324`	`}`
`324`	`325`	`else`
`325`	`326`	`{`