commit bad75993840305a27c1457aa90ce88cb6c3f9225
author Linux Build Service Account <lnxbuild@localhost> Thu Dec 05 18:33:13 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Dec 05 18:33:13 2013 -0800
tree c144c9a7f593c8b22a19cd6b419cd6671254c456
parent 6def9112f39584d86abb522b525a13e050f44f7f
parent a9f45d38494653b1f203def9325e79a0d378cee2

Merge "IPACM: fix lan/wan calloc free issue"

ipacm/src/IPACM_Lan.cpp

diff --git a/ipacm/src/IPACM_Lan.cpp b/ipacm/src/IPACM_Lan.cpp
index 1375ce8..6ff9880 100644
--- a/ipacm/src/IPACM_Lan.cpp
+++ b/ipacm/src/IPACM_Lan.cpp
@@ -1338,6 +1338,11 @@
 	{
 		free(iface_query);
 	}
+	if (route_rule != NULL)
+	{
+		free(route_rule);
+	}
+
 	
 	return res;
 }

ipacm/src/IPACM_Wan.cpp

diff --git a/ipacm/src/IPACM_Wan.cpp b/ipacm/src/IPACM_Wan.cpp
index f353aea..0672c92 100644
--- a/ipacm/src/IPACM_Wan.cpp
+++ b/ipacm/src/IPACM_Wan.cpp
@@ -1655,10 +1655,30 @@
 	}
 
 fail:
-	free(tx_prop);
-	free(rx_prop);
-	free(iface_query);
-
+	if (tx_prop != NULL)
+	{
+		free(tx_prop); 
+	}
+	if (rx_prop != NULL)
+	{
+		free(rx_prop);
+	}
+	if (iface_query != NULL)
+	{
+		free(iface_query);
+	}
+	if (wan_route_rule_v4_hdl != NULL)
+	{
+		free(wan_route_rule_v4_hdl);
+	}
+	if (wan_route_rule_v6_hdl != NULL)
+	{
+		free(wan_route_rule_v6_hdl);
+	}
+	if (wan_route_rule_v6_hdl_a5 != NULL)
+	{
+		free(wan_route_rule_v6_hdl_a5);
+	}
 	return res;
 }