Index: source/ariba/communication/BaseCommunication.cpp
===================================================================
--- source/ariba/communication/BaseCommunication.cpp	(revision 8597)
+++ source/ariba/communication/BaseCommunication.cpp	(revision 8606)
@@ -294,6 +294,8 @@
 		receiveMessage(msg, dmsg->local, dmsg->remote);
 		msg->dropPayload();
+		delete dmsg->local;
+		delete dmsg->remote;
+		delete msg;
 		delete dmsg;
-		delete msg;
 	}
 }
@@ -399,6 +401,5 @@
 				ld->remoteLocator, endpoint_set::Layer1_3 | endpoint_set::NoLoopback);
 			localDescriptor.getEndpoints().add(
-				local, endpoint_set::Layer1_3 | endpoint_set::NoLoopback
-			);
+				local, endpoint_set::Layer1_3 | endpoint_set::NoLoopback);
 
 			// link is now up-> add it
Index: source/ariba/communication/networkinfo/AddressDiscovery.cpp
===================================================================
--- source/ariba/communication/networkinfo/AddressDiscovery.cpp	(revision 8597)
+++ source/ariba/communication/networkinfo/AddressDiscovery.cpp	(revision 8606)
@@ -133,4 +133,6 @@
 		}
 	}
+
+	freeifaddrs(ifaceBuffer);
 }