From 598a9d7302ffad7653cada366084c3516ee35ad8 Mon Sep 17 00:00:00 2001 From: "Stephen D. Huston" Date: Tue, 3 Mar 2015 23:09:54 +0000 Subject: Fix possible double-free discussed in QPID-6368 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1663828 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/qpid/broker/PersistableQueue.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'qpid/cpp/src') diff --git a/qpid/cpp/src/qpid/broker/PersistableQueue.h b/qpid/cpp/src/qpid/broker/PersistableQueue.h index 655d26bc74..6733163084 100644 --- a/qpid/cpp/src/qpid/broker/PersistableQueue.h +++ b/qpid/cpp/src/qpid/broker/PersistableQueue.h @@ -25,7 +25,6 @@ #include #include "qpid/broker/Persistable.h" #include "qpid/management/Manageable.h" -#include namespace qpid { namespace broker { @@ -51,12 +50,12 @@ public: class PersistableQueue : public Persistable { public: - typedef boost::shared_ptr shared_ptr; - virtual const std::string& getName() const = 0; virtual ~PersistableQueue() { - if (externalQueueStore) + if (externalQueueStore) { delete externalQueueStore; + externalQueueStore = 0; + } }; virtual void setExternalQueueStore(ExternalQueueStore* inst) = 0; -- cgit v1.2.1