From 439e582dc69fe44d0fe4a1800f83c51d94813b53 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Thu, 12 Sep 2013 00:10:28 +0500 Subject: [PATCH] FS-5780 --resolve Conflicts: libs/sofia-sip/.update --- libs/sofia-sip/.update | 2 +- libs/sofia-sip/libsofia-sip-ua/nta/nta.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update index aafaa52777..99524aea8c 100644 --- a/libs/sofia-sip/.update +++ b/libs/sofia-sip/.update @@ -1 +1 @@ -Thu Sep 5 20:56:36 CDT 2013 +Thu Sep 12 00:10:51 CDT 2013 diff --git a/libs/sofia-sip/libsofia-sip-ua/nta/nta.c b/libs/sofia-sip/libsofia-sip-ua/nta/nta.c index 86355a5f45..763933b070 100644 --- a/libs/sofia-sip/libsofia-sip-ua/nta/nta.c +++ b/libs/sofia-sip/libsofia-sip-ua/nta/nta.c @@ -3818,8 +3818,10 @@ int nta_msg_ackbye(nta_agent_t *agent, msg_t *msg) return 0; err: - msg_destroy(amsg); + msg_destroy(bmsg); + msg_destroy(amsg); + return -1; }