From 06932dca518847ff5382ec7d8c6ed97814d0cc4e Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
Date: Mon, 1 Nov 2010 14:28:05 -0400
Subject: [PATCH] [#4367] Fix segfault when unloading account map
---
sflphone-common/src/managerimpl.cpp | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/sflphone-common/src/managerimpl.cpp b/sflphone-common/src/managerimpl.cpp
index 9ab5cd70ca..a92401e78b 100644
--- a/sflphone-common/src/managerimpl.cpp
+++ b/sflphone-common/src/managerimpl.cpp
@@ -3900,8 +3900,11 @@ void ManagerImpl::unloadAccountMap ()
_debug ("Manager: Unloading account %s", iter->first.c_str());
- delete iter->second;
- iter->second = NULL;
+ // Avoid removing the IP2IP account twice
+ if(iter->first != "") {
+ delete iter->second;
+ iter->second = NULL;
+ }
iter++;
}
--
GitLab