Sanity check to avoid potential null pointer deref

plenarius · Sep 26, 2024 · a0ce4da · a0ce4da
1 parent e8829c0
commit a0ce4da
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Plugins/Player/Player.cpp b/Plugins/Player/Player.cpp
@@ -953,9 +953,9 @@ NWNX_EXPORT ArgumentStack SetPersistentLocation(ArgumentStack&& args)
 
                     // Fake some changes to their area/position as though they had a TURD
                     auto *pWP = Utils::AsNWSWaypoint(Utils::GetGameObject(wpOID));
-                    if (pWP)
+                    auto pCreature = Utils::AsNWSCreature(Utils::GetGameObject(pPlayer->m_oidNWSObject));
+                    if (pWP && pCreature)
                     {
-                        auto pCreature = Utils::AsNWSCreature(Utils::GetGameObject(pPlayer->m_oidNWSObject));
                         pCreature->m_oidDesiredArea = pWP->m_oidArea;
                         pCreature->m_vDesiredAreaLocation = pWP->m_vPosition;
                         pCreature->m_bDesiredAreaUpdateComplete = false;