From ff2cd4a0322fc2942323702a37844b0cfa963ce4 Mon Sep 17 00:00:00 2001
From: Giacomo Pozzoni <giacomopoz@gmail.com>
Date: Tue, 1 Jan 2019 15:00:27 +0100
Subject: Scripts/Commands: Fix crash caused by .set npc model (#22877)

* Scripts/Commands: Fix crash caused by .set npc model

Fix crash caused by .set npc model with invalid model id

(cherry picked from commit 20ea24bf5ccf165ce19139d1f7ec7c650719eb68)
---
 src/server/scripts/Commands/cs_modify.cpp | 2 +-
 src/server/scripts/Commands/cs_npc.cpp    | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/server/scripts/Commands')

diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp
index a0eaa8aea32..804d6736455 100644
--- a/src/server/scripts/Commands/cs_modify.cpp
+++ b/src/server/scripts/Commands/cs_modify.cpp
@@ -734,7 +734,7 @@ public:
 
             if (rankThresholdItr == end)
             {
-                handler->PSendSysMessage(LANG_COMMAND_FACTION_INVPARAM, rankTxt);
+                handler->PSendSysMessage(LANG_COMMAND_INVALID_PARAM, rankTxt);
                 handler->SetSentErrorMessage(true);
                 return false;
             }
diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp
index a2e77968346..0c82ee14b7f 100644
--- a/src/server/scripts/Commands/cs_npc.cpp
+++ b/src/server/scripts/Commands/cs_npc.cpp
@@ -879,6 +879,13 @@ public:
             return false;
         }
 
+        if (!sCreatureDisplayInfoStore.LookupEntry(displayId))
+        {
+            handler->PSendSysMessage(LANG_COMMAND_INVALID_PARAM, args);
+            handler->SetSentErrorMessage(true);
+            return false;
+        }
+
         creature->SetDisplayId(displayId);
         creature->SetNativeDisplayId(displayId);
 
-- 
cgit v1.2.3