Merge pull request #297 from Hoikas/crash-fix

Fix Clone Race Condition
12 years ago · 777197c8c7
1 changed files with 6 additions and 0 deletions
--- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrLoad.cpp
+++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrLoad.cpp
@ -105,6 +105,12 @@ plKey plNetClientMgr::ILoadClone(plLoadCloneMsg *pCloneMsg)

    if(pCloneMsg->GetIsLoading())
    {
+        if (!cloneKey)
+        {
+            DebugMsg("ILoadClone: got a null clone key... either a loading race or someone is being naughty.");
+            return nullptr;
+        }
+
        if (cloneKey->ObjectIsLoaded())
        {
            DebugMsg("ILoadClone: object %s is already loaded, ignoring", cloneKey->GetUoid().StringIze().c_str());