Fixed a crash caused by Function's convention being freed twice when Source.Python is unloading.

jordanbriere · jordanbriere · commit debc63bf4a64 · 2019-12-14T00:44:56.000-05:00
diff --git a/src/core/modules/memory/memory_function.cpp b/src/core/modules/memory/memory_function.cpp
@@ -381,6 +381,9 @@ void CFunction::AddHook(HookType_t eType, PyObject* pCallable)
 
 	if (!pHook) {
 		pHook = HookFunctionHelper((void *) m_ulAddr, m_pCallingConvention);
+
+		// DynamicHooks will handle our convention from there, regardless if we allocated it or not.
+		m_bAllocatedCallingConvention = false;
 	}
 	
 	// Add the hook handler. If it's already added, it won't be added twice

Original file line number	Diff line number	Diff line change
`@@ -381,6 +381,9 @@ void CFunction::AddHook(HookType_t eType, PyObject* pCallable)`
`381`	`381`
`382`	`382`	`if (!pHook) {`
`383`	`383`	`pHook = HookFunctionHelper((void *) m_ulAddr, m_pCallingConvention);`
	`384`	`+`
	`385`	`+ // DynamicHooks will handle our convention from there, regardless if we allocated it or not.`
	`386`	`+ m_bAllocatedCallingConvention = false;`
`384`	`387`	`}`
`385`	`388`
`386`	`389`	`// Add the hook handler. If it's already added, it won't be added twice`