修正：UnLua函数绑定多个不同签名的代理导致崩溃 Tencent#660

xuyanghuang-tencent · xuyanghuang-tencent · commit b8260b436f57 · 2023-10-30T19:13:20.000+08:00
diff --git a/Plugins/UnLua/Source/UnLua/Private/LuaDelegateHandler.cpp b/Plugins/UnLua/Source/UnLua/Private/LuaDelegateHandler.cpp
@@ -36,6 +36,8 @@ void ULuaDelegateHandler::BindTo(FScriptDelegate* InDelegate)
 
 void ULuaDelegateHandler::AddTo(FMulticastDelegateProperty* InProperty, void* InDelegate)
 {
+    check(InDelegate);
+
     Delegate = InDelegate;
     FScriptDelegate DynamicDelegate;
     DynamicDelegate.BindUFunction(this, NAME_Dummy);
diff --git a/Plugins/UnLua/Source/UnLua/Private/Registries/DelegateRegistry.cpp b/Plugins/UnLua/Source/UnLua/Private/Registries/DelegateRegistry.cpp
@@ -104,6 +104,31 @@ namespace UnLua
         Handler->Reset();
     }
 
+    void FDelegateRegistry::CheckSignatureCompatible(lua_State* L, ULuaDelegateHandler* Handler, void* OtherDelegate)
+    {
+        check(L);
+        check(Handler);
+
+        if (!CheckSignatureCompatible(Handler->Delegate, OtherDelegate))
+            luaL_error(L, "delegate handler signatures are not compatible");
+    }
+
+    bool FDelegateRegistry::CheckSignatureCompatible(void* ADelegate, void* BDelegate)
+    {
+        if (ADelegate == BDelegate)
+            return true;
+
+        auto AInfo = Delegates.Find(ADelegate);
+        if (!AInfo || !AInfo->SignatureFunction)
+            return false;
+
+        auto BInfo = Delegates.Find(BDelegate);
+        if (!BInfo|| !BInfo->SignatureFunction)
+            return false;
+
+        return AInfo->SignatureFunction->IsSignatureCompatibleWith(BInfo->SignatureFunction);
+    }
+
 #pragma region FScriptDelgate
 
     void FDelegateRegistry::Register(void* Delegate, FProperty* Property, UObject* Owner)
@@ -221,6 +246,7 @@ namespace UnLua
         const auto Cached = CachedHandlers.Find(DelegatePair);
         if (Cached && Cached->IsValid())
         {
+            CheckSignatureCompatible(L, Cached->Get(), Delegate);
             (*Cached)->AddTo(Info.MulticastProperty, Delegate);
             Info.Handlers.Add(*Cached);
             return;
diff --git a/Plugins/UnLua/Source/UnLua/Private/Registries/DelegateRegistry.h b/Plugins/UnLua/Source/UnLua/Private/Registries/DelegateRegistry.h
@@ -82,6 +82,10 @@ namespace UnLua
         void NotifyHandlerBeginDestroy(ULuaDelegateHandler* Handler);
 
     private:
+        void CheckSignatureCompatible(lua_State* L, ULuaDelegateHandler* Handler, void* OtherDelegate);
+
+        bool CheckSignatureCompatible(void* ADelegate, void* BDelegate);
+
         TSharedPtr<FFunctionDesc> GetSignatureDesc(const void* Delegate);
 
         ULuaDelegateHandler* CreateHandler(int LuaRef, UObject* Owner, UObject* SelfObject);

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,8 @@ void ULuaDelegateHandler::BindTo(FScriptDelegate* InDelegate)`
`36`	`36`
`37`	`37`	`void ULuaDelegateHandler::AddTo(FMulticastDelegateProperty* InProperty, void* InDelegate)`
`38`	`38`	`{`
	`39`	`+ check(InDelegate);`
	`40`	`+`
`39`	`41`	`Delegate = InDelegate;`
`40`	`42`	`FScriptDelegate DynamicDelegate;`
`41`	`43`	`DynamicDelegate.BindUFunction(this, NAME_Dummy);`