commit 5a8c0fd531bbabdc4dce99b4d850f9d9f735ff36
author Skylar Chang <chiaweic@codeaurora.org> Wed Sep 09 09:57:57 2015 -0700
committer Skylar Chang <chiaweic@codeaurora.org> Wed Sep 09 18:55:44 2015 -0700
tree b8ff3e20b2de26b024934ed75f70ea8ec506194a
parent b707257475419ad70852346cd4be4fb541421c70

IPACM: fix memory leak during client connect

During client connect, after modifying filter rule
memory should be freed.

Change-Id: Iead08731ba1ea85b7274e13e53233ee866bf1dda

ipacm/src/IPACM_Lan.cpp

diff --git a/ipacm/src/IPACM_Lan.cpp b/ipacm/src/IPACM_Lan.cpp
index 6f5f2ad..2fa3074 100644
--- a/ipacm/src/IPACM_Lan.cpp
+++ b/ipacm/src/IPACM_Lan.cpp
@@ -1807,7 +1807,6 @@
 	}
 fail:
 	free(pHeaderDescriptor);
-
 	return res;
 }
 
@@ -2273,7 +2272,6 @@
 	}
 fail:
 	free(pHeaderDescriptor);
-
 	return res;
 }
 
@@ -5376,10 +5374,8 @@
 	}
 
 fail:
-	if(pFilteringTable == NULL)
-	{
-		free(pFilteringTable);
-	}
+	free(pFilteringTable);
+
 	return res;
 }
 
@@ -5647,10 +5643,8 @@
 	}
 
 fail:
-	if (pFilteringTable == NULL)
-	{
-		free(pFilteringTable);
-	}
+	free(pFilteringTable);
+
 	return res;
 }
 

ipacm/src/IPACM_Wlan.cpp

diff --git a/ipacm/src/IPACM_Wlan.cpp b/ipacm/src/IPACM_Wlan.cpp
index f51c0c3..075da13 100644
--- a/ipacm/src/IPACM_Wlan.cpp
+++ b/ipacm/src/IPACM_Wlan.cpp
@@ -3767,10 +3767,7 @@
 	}
 
 fail:
-	if(pFilteringTable == NULL)
-	{
-		free(pFilteringTable);
-	}
+	free(pFilteringTable);
 	return res;
 }
 
@@ -4041,10 +4038,7 @@
 	}
 
 fail:
-	if(pFilteringTable == NULL)
-	{
-		free(pFilteringTable);
-	}
+	free(pFilteringTable);
 	return res;
 }
 
@@ -5369,9 +5363,6 @@
 		goto fail;
 	}
 fail:
-	if(pFilteringTable == NULL)
-	{
-		free(pFilteringTable);
-	}
+	free(pFilteringTable);
 	return res;
 }