Fix crash inside VGUI2Extension

hzqst · hzqst · commit e846abaf65d4 · 2025-02-08T14:28:55.000+08:00
diff --git a/Plugins/VGUI2Extension/GameUI.cpp b/Plugins/VGUI2Extension/GameUI.cpp
@@ -3605,7 +3605,7 @@ void GameUI_FillAddress(void)
 					ctx->OperatorNewAddress = nextaddr;
 				}
 			}
-			else if (address > ctx->OperatorNewAddress && address[0] == 0xE8)
+			else if (ctx->OperatorNewAddress && address > ctx->OperatorNewAddress && address[0] == 0xE8)
 			{
 				PVOID call_candidate = (decltype(call_candidate))GetCallAddress(address);
 
@@ -3990,6 +3990,7 @@ void GameUI_InstallHooks(void)
 	{
 		Install_InlineHook(CBasePanel_ApplySchemeSettings);
 	}
+
 	if (gPrivateFuncs.GameUI_KeyValues_LoadFromFile)
 	{
 		Install_InlineHook(GameUI_KeyValues_LoadFromFile);

Original file line number	Diff line number	Diff line change
`@@ -3605,7 +3605,7 @@ void GameUI_FillAddress(void)`
`3605`	`3605`	`ctx->OperatorNewAddress = nextaddr;`
`3606`	`3606`	`}`
`3607`	`3607`	`}`
`3608`		`- else if (address > ctx->OperatorNewAddress && address[0] == 0xE8)`
	`3608`	`+ else if (ctx->OperatorNewAddress && address > ctx->OperatorNewAddress && address[0] == 0xE8)`
`3609`	`3609`	`{`
`3610`	`3610`	`PVOID call_candidate = (decltype(call_candidate))GetCallAddress(address);`
`3611`	`3611`
`@@ -3990,6 +3990,7 @@ void GameUI_InstallHooks(void)`
`3990`	`3990`	`{`
`3991`	`3991`	`Install_InlineHook(CBasePanel_ApplySchemeSettings);`
`3992`	`3992`	`}`
	`3993`	`+`
`3993`	`3994`	`if (gPrivateFuncs.GameUI_KeyValues_LoadFromFile)`
`3994`	`3995`	`{`
`3995`	`3996`	`Install_InlineHook(GameUI_KeyValues_LoadFromFile);`