From 0d0d4ee50678c6bc179bf0e6b3cbc8feb97c2e85 Mon Sep 17 00:00:00 2001
From: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
Date: Wed, 7 Jan 2015 17:43:30 -0500
Subject: [PATCH] daemon: fix crash when setting publishedIP
Refs #62046
Change-Id: I7fc886febd738c9d1b8a4327d14c05b73f32e13c
---
daemon/src/sip/sipaccountbase.cpp | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/daemon/src/sip/sipaccountbase.cpp b/daemon/src/sip/sipaccountbase.cpp
index 07ec437186..49adcfa147 100644
--- a/daemon/src/sip/sipaccountbase.cpp
+++ b/daemon/src/sip/sipaccountbase.cpp
@@ -143,10 +143,16 @@ void SIPAccountBase::unserialize(const YAML::Node &node)
int port = DEFAULT_SIP_PORT;
parseValue(node, PORT_KEY, port);
localPort_ = port;
- parseValue(node, PUBLISH_ADDR_KEY, publishedIpAddress_);
+
+ parseValue(node, SAME_AS_LOCAL_KEY, publishedSameasLocal_);
+ std::string publishedIpAddress;
+ parseValue(node, PUBLISH_ADDR_KEY, publishedIpAddress);
+ IpAddr publishedIp = publishedIpAddress;
+ if (publishedIp and not publishedSameasLocal_)
+ setPublishedAddress(publishedIp);
+
parseValue(node, PUBLISH_PORT_KEY, port);
publishedPort_ = port;
- parseValue(node, SAME_AS_LOCAL_KEY, publishedSameasLocal_);
parseValue(node, DTMF_TYPE_KEY, dtmfType_);
--
GitLab