From 08dcee0cf9a56944027d3f65b7fd5c4a4959761c Mon Sep 17 00:00:00 2001 From: Giacomo Pozzoni Date: Mon, 7 Jan 2019 10:17:05 +0100 Subject: Scripts/Misc: Fix LoadMinionData() dynamic analysis issues Fix issues reported by Address Sanitizer about LoadMinionData() calls on arrays that don't end with a {0, 0} pair. --- .../Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp | 3 ++- src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp index 23fe001172c..de41d764916 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp @@ -32,7 +32,8 @@ DoorData const doorData[] = MinionData const minionData[] = { { NPC_SKARVALD, DATA_SKARVALD_DALRONN }, - { NPC_DALRONN, DATA_SKARVALD_DALRONN } + { NPC_DALRONN, DATA_SKARVALD_DALRONN }, + { 0, 0 } }; class instance_utgarde_keep : public InstanceMapScript diff --git a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp index 113c28e1a73..90bfeec6d93 100644 --- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp +++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp @@ -34,7 +34,8 @@ MinionData const minionData[] = { NPC_KROSH_FIREHAND, DATA_MAULGAR }, { NPC_OLM_THE_SUMMONER, DATA_MAULGAR }, { NPC_KIGGLER_THE_CRAZED, DATA_MAULGAR }, - { NPC_BLINDEYE_THE_SEER, DATA_MAULGAR } + { NPC_BLINDEYE_THE_SEER, DATA_MAULGAR }, + { 0, 0 } }; class instance_gruuls_lair : public InstanceMapScript -- cgit v1.2.3