From 08ac99744bca5dc4c74f7061acfd83cd78cfb1d6 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Sun, 26 Nov 2017 12:30:02 +0100 Subject: Core/Maps: Fix memory leak in BoundaryUnionBoundary Add missing destructor in BoundaryUnionBoundary to avoid reporting a memory leak (even if it's used only in a global variable) (cherry picked from commit 724499cf9c6b2027d130d6a8a505413c7da6cb3e) --- src/server/game/Maps/AreaBoundary.cpp | 5 +++++ src/server/game/Maps/AreaBoundary.h | 1 + 2 files changed, 6 insertions(+) (limited to 'src') diff --git a/src/server/game/Maps/AreaBoundary.cpp b/src/server/game/Maps/AreaBoundary.cpp index 6d0daac115d..9b207087a91 100644 --- a/src/server/game/Maps/AreaBoundary.cpp +++ b/src/server/game/Maps/AreaBoundary.cpp @@ -103,6 +103,11 @@ BoundaryUnionBoundary::BoundaryUnionBoundary(AreaBoundary const* b1, AreaBoundar { ASSERT(b1 && b2); } +BoundaryUnionBoundary::~BoundaryUnionBoundary() +{ + delete _b1; + delete _b2; +} bool BoundaryUnionBoundary::IsWithinBoundaryArea(Position const* pos) const { return (_b1->IsWithinBoundary(pos) || _b2->IsWithinBoundary(pos)); diff --git a/src/server/game/Maps/AreaBoundary.h b/src/server/game/Maps/AreaBoundary.h index ea5d55f7839..fcb456261b1 100644 --- a/src/server/game/Maps/AreaBoundary.h +++ b/src/server/game/Maps/AreaBoundary.h @@ -156,6 +156,7 @@ class TC_GAME_API BoundaryUnionBoundary : public AreaBoundary BoundaryUnionBoundary(AreaBoundary const* b1, AreaBoundary const* b2, bool isInverted = false); protected: + virtual ~BoundaryUnionBoundary(); bool IsWithinBoundaryArea(Position const* pos) const override; private: -- cgit v1.2.3