Changed GetTrampolineAddress to check for Hook.

CookStar · CookStar · commit 3cb810d967d2 · 2020-09-23T20:53:23.000+09:00
diff --git a/src/core/modules/memory/memory_function.cpp b/src/core/modules/memory/memory_function.cpp
@@ -337,10 +337,10 @@ object CFunction::SkipHooks(tuple args, dict kw)
 unsigned long CFunction::GetTrampolineAddress()
 {
 	CHook* pHook = GetHookManager()->FindHook((void *) m_ulAddr);
-	if (pHook)
-		return (unsigned long) pHook->m_pTrampoline;
+	if (!pHook)
+		BOOST_RAISE_EXCEPTION(PyExc_ValueError, "Function was not hooked.")
 
-	return m_ulAddr;
+	return (unsigned long) pHook->m_pTrampoline;
 }
 
 CHook* HookFunctionHelper(void* addr, ICallingConvention* pConv)

Original file line number	Diff line number	Diff line change
`@@ -337,10 +337,10 @@ object CFunction::SkipHooks(tuple args, dict kw)`
`337`	`337`	`unsigned long CFunction::GetTrampolineAddress()`
`338`	`338`	`{`
`339`	`339`	`CHook* pHook = GetHookManager()->FindHook((void *) m_ulAddr);`
`340`		`- if (pHook)`
`341`		`- return (unsigned long) pHook->m_pTrampoline;`
	`340`	`+ if (!pHook)`
	`341`	`+ BOOST_RAISE_EXCEPTION(PyExc_ValueError, "Function was not hooked.")`
`342`	`342`
`343`		`- return m_ulAddr;`
	`343`	`+ return (unsigned long) pHook->m_pTrampoline;`
`344`	`344`	`}`
`345`	`345`
`346`	`346`	`CHook* HookFunctionHelper(void* addr, ICallingConvention* pConv)`