From a17c6d648293ff940f522325636e368e34cbc80d Mon Sep 17 00:00:00 2001
From: Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>
Date: Thu, 11 Sep 2014 20:42:30 +0200
Subject: [PATCH] [ #54788 ] Fix double free when quitting
---
src/contact.cpp | 13 ++++++++++++-
src/phonedirectorymodel.cpp | 25 +++++++++++++++++--------
src/phonenumber.cpp | 3 +++
3 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/src/contact.cpp b/src/contact.cpp
index f2cce1d6..d3a7fa59 100644
--- a/src/contact.cpp
+++ b/src/contact.cpp
@@ -32,6 +32,7 @@
class ContactPrivate {
public:
ContactPrivate(Contact* contact, AbstractContactBackend* parent);
+ ~ContactPrivate();
QString m_FirstName ;
QString m_SecondName ;
QString m_NickName ;
@@ -100,6 +101,11 @@ ContactPrivate::ContactPrivate(Contact* contact, AbstractContactBackend* parent)
m_pBackend(parent?parent:TransitionalContactBackend::instance())
{}
+ContactPrivate::~ContactPrivate()
+{
+ delete m_pPhoto;
+}
+
Contact::PhoneNumbers::PhoneNumbers(Contact* parent) : QVector<PhoneNumber*>(),CategorizedCompositeNode(CategorizedCompositeNode::Type::NUMBER),
m_pParent2(parent)
{
@@ -126,7 +132,12 @@ Contact::Contact(AbstractContactBackend* parent):QObject(parent?parent:Transitio
///Destructor
Contact::~Contact()
{
- delete d->m_pPhoto;
+ //Unregister itself from the D-Pointer list
+ d->m_lParents.removeAll(this);
+
+ if (!d->m_lParents.size()) {
+ delete d;
+ }
}
///Get the phone number list
diff --git a/src/phonedirectorymodel.cpp b/src/phonedirectorymodel.cpp
index dcff6e65..7a91ac61 100644
--- a/src/phonedirectorymodel.cpp
+++ b/src/phonedirectorymodel.cpp
@@ -47,6 +47,7 @@ PhoneDirectoryModel::PhoneDirectoryModel(QObject* parent) :
PhoneDirectoryModel::~PhoneDirectoryModel()
{
QList<NumberWrapper*> vals = m_hNumbersByNames.values();
+ //Used by indexes
m_hNumbersByNames.clear();
m_lSortedNames.clear();
while (vals.size()) {
@@ -54,6 +55,8 @@ PhoneDirectoryModel::~PhoneDirectoryModel()
vals.removeAt(0);
delete w;
}
+
+ //Used by auto completion
vals = m_hSortedNumbers.values();
m_hSortedNumbers.clear();
m_hDirectory.clear();
@@ -296,8 +299,10 @@ void PhoneDirectoryModel::setAccount(PhoneNumber* number, Account* account ) {
//Let make sure none is created in the future for nothing
if (!wrap) {
//It wont be a duplicate as none exist for this URI
+ const QString extendedUri = strippedUri+'@'+account->hostname();
wrap = new NumberWrapper();
- m_hDirectory[strippedUri+'@'+account->hostname()] = wrap;
+ m_hDirectory [extendedUri] = wrap;
+ m_hSortedNumbers[extendedUri] = wrap;
}
else {
@@ -439,6 +444,7 @@ PhoneNumber* PhoneDirectoryModel::getNumber(const QString& uri, Contact* contact
//See if the number is already loaded
NumberWrapper* wrap = m_hDirectory[strippedUri];
NumberWrapper* wrap2 = nullptr;
+ NumberWrapper* wrap3 = nullptr;
//Check if the URI is complete or short
const bool hasAtSign = strippedUri.hasHostname();
@@ -468,9 +474,9 @@ PhoneNumber* PhoneDirectoryModel::getNumber(const QString& uri, Contact* contact
//results. It cannot be merged with wrap2 as this check only work if the
//candidate has an account.
if (hasAtSign && account && strippedUri.hostname() == account->hostname()) {
- wrap2 = m_hDirectory[strippedUri.userinfo()];
- if (wrap2) {
- foreach(PhoneNumber* number, wrap2->numbers) {
+ wrap3 = m_hDirectory[strippedUri.userinfo()];
+ if (wrap3) {
+ foreach(PhoneNumber* number, wrap3->numbers) {
if (number->account() == account) {
if (contact && ((!number->contact()) || (contact->uid() == number->contact()->uid())))
number->setContact(contact); //TODO Check all cases from fillDetails()
@@ -527,18 +533,21 @@ PhoneNumber* PhoneDirectoryModel::getNumber(const QString& uri, Contact* contact
connect(number,SIGNAL(changed()),this,SLOT(slotChanged()));
if (!wrap) {
wrap = new NumberWrapper();
- m_hDirectory[strippedUri] = wrap;
+ m_hDirectory [strippedUri] = wrap;
+ m_hSortedNumbers[strippedUri] = wrap;
//Also add its alternative URI, it should be safe to do
if ( !hasAtSign && account && !account->hostname().isEmpty() ) {
- if (!wrap2) {
+ const QString extendedUri = strippedUri+'@'+account->hostname();
+ //Also check if it hasn't been created by setAccount
+ if ((!wrap2) && (!m_hDirectory[extendedUri])) {
wrap2 = new NumberWrapper();
- m_hDirectory[strippedUri+'@'+account->hostname()] = wrap2;
+ m_hDirectory [extendedUri] = wrap2;
+ m_hSortedNumbers[extendedUri] = wrap2;
}
wrap2->numbers << number;
}
- m_hSortedNumbers[strippedUri] = wrap;
}
wrap->numbers << number;
emit layoutChanged();
diff --git a/src/phonenumber.cpp b/src/phonenumber.cpp
index b1e82643..0b47ef5c 100644
--- a/src/phonenumber.cpp
+++ b/src/phonenumber.cpp
@@ -140,6 +140,9 @@ d(new PrivatePhoneNumber(number,cat,st))
PhoneNumber::~PhoneNumber()
{
+ d->m_lParents.removeAll(this);
+ if (!d->m_lParents.size())
+ delete d;
}
///Return if this number presence is being tracked
--
GitLab