Index: /source/ariba/communication/networkinfo/AddressDiscovery.cpp
===================================================================
--- /source/ariba/communication/networkinfo/AddressDiscovery.cpp	(revision 5756)
+++ /source/ariba/communication/networkinfo/AddressDiscovery.cpp	(revision 5757)
@@ -97,5 +97,4 @@
 	struct ifaddrs* tmpAddr     = NULL;
 	void*           tmpAddrPtr  = NULL;
-	char            straddr     [INET_ADDRSTRLEN];
 
 	int ret = getifaddrs( &ifaceBuffer );
@@ -107,8 +106,9 @@
 		if(i == NULL) continue;
 		struct sockaddr* addr = i->ifa_addr;
+		if (addr==NULL) continue;
 
 		if (addr->sa_family == AF_INET) {
 			// look for ipv4
-			if (addr==NULL) continue;
+			char straddr[INET_ADDRSTRLEN];
 			tmpAddrPtr= &((struct sockaddr_in*)addr)->sin_addr;
 			inet_ntop( i->ifa_addr->sa_family, tmpAddrPtr, straddr, sizeof(straddr) );
@@ -120,5 +120,5 @@
 		if (addr->sa_family == AF_INET6) {
 			// look for ipv6
-			if (addr==NULL) continue;
+			char straddr[INET6_ADDRSTRLEN];
 			tmpAddrPtr= &((struct sockaddr_in6*)addr)->sin6_addr;
 			inet_ntop( i->ifa_addr->sa_family, tmpAddrPtr, straddr, sizeof(straddr) );