From 111b0d468803c2e63f33720049181466e22de111 Mon Sep 17 00:00:00 2001
From: Stefan Becker <stefan.becker@nokia.com>
Date: Wed, 20 Oct 2010 06:36:38 +0300
Subject: [PATCH] fix memory leaks in previous commit (cherry picked from
 commit 9d8ab447ebe0a250e7eb992b8b4f7f2c35218060)

---
 src/core/sipmsg.c | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/core/sipmsg.c b/src/core/sipmsg.c
index 2eaf83c8..bc87d7d8 100644
--- a/src/core/sipmsg.c
+++ b/src/core/sipmsg.c
@@ -239,7 +239,7 @@ void sipmsg_strip_headers(struct sipmsg *msg, const gchar *keepers[]) {
 			i++;
 		}
 
-		if (!keeper) {      
+		if (!keeper) {
 			GSList *to_delete = entry;
 			SIPE_DEBUG_INFO("sipmsg_strip_headers: removing %s", elem->name);
 			entry = g_slist_next(entry);
@@ -371,9 +371,7 @@ GSList *sipmsg_parse_endpoints_header(const gchar *header)
 
 void sipmsg_parse_p_asserted_identity(const gchar *header, gchar **sip_uri,
 				      gchar **tel_uri) {
-	gchar **parts;
-	gchar *part;
-	int i;
+	gchar **parts, **p;
 
 	*sip_uri = NULL;
 	*tel_uri = NULL;
@@ -384,28 +382,34 @@ void sipmsg_parse_p_asserted_identity(const gchar *header, gchar **sip_uri,
 	}
 
 	parts = g_strsplit(header, ",", 0);
-
-	for (i = 0; (part = parts[i]) != NULL; ++i) {
-		gchar *uri = sipmsg_find_part_of_header(part, "<", ">", NULL);
+	
+	for (p = parts; *p; p++) {
+		gchar *uri = sipmsg_find_part_of_header(*p, "<", ">", NULL);
 		if (!uri)
 			continue;
 
 		if (g_ascii_strncasecmp(uri, "sip:", 4) == 0) {
-			if (*sip_uri)
+			if (*sip_uri) {
 				SIPE_DEBUG_WARNING_NOFORMAT("More than one "
 					"sip: URI found in P-Asserted-Identity!");
-			else
-				*sip_uri = g_strdup(uri);
+			} else {
+				*sip_uri = uri;
+				uri = NULL;
+			}
 		} else if (g_ascii_strncasecmp(uri, "tel:", 4) == 0){
-			if (*tel_uri)
+			if (*tel_uri) {
 				SIPE_DEBUG_WARNING_NOFORMAT("More than one "
 					"tel: URI found in P-Asserted-Identity!");
-			else
-				*tel_uri = g_strdup(uri);
+			} else {
+				*tel_uri = uri;
+				uri = NULL;
+			}
 		}
+
+		g_free(uri);
 	}
 
-	g_free(parts);
+	g_strfreev(parts);
 }
 
 /*
-- 
2.11.4.GIT