--- libelwix/src/net.c	2016/05/14 13:12:43	1.12.4.2
+++ libelwix/src/net.c	2016/05/14 13:26:04	1.12.4.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: net.c,v 1.12.4.2 2016/05/14 13:12:43 misho Exp $
+* $Id: net.c,v 1.12.4.3 2016/05/14 13:26:04 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -499,34 +499,27 @@ e_ether_addr(const char *ifname, ether_addr_t * __rest
 	if (!ifname)
 		return NULL;
 
-	a = e_malloc(sizeof(ether_addr_t));
-	if (!a)
-		return NULL;
-	else
-		memset(a, 0, sizeof(ether_addr_t));
-
 	getifaddrs(&ifa);
 	for (p = ifa; p && p->ifa_name; p = p->ifa_next) {
 #ifndef __linux__
 		if (p->ifa_name && !strcmp(p->ifa_name, ifname) && p->ifa_addr && 
 				p->ifa_addr->sa_family == AF_LINK) {
-			memcpy(a, LLADDR((struct sockaddr_dl*) p->ifa_addr), sizeof(ether_addr_t));
+			a = e_malloc(sizeof(ether_addr_t));
+			if (a)
+				memcpy(a, LLADDR((struct sockaddr_dl*) p->ifa_addr), sizeof(ether_addr_t));
 			break;
 		}
 #else
 		if (p->ifa_name && !strcmp(p->ifa_name, ifname)) {
 			s = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
-			if (s == -1) {
-				e_free(a);
-				a = NULL;
+			if (s == -1)
 				break;
-			} else
-				strlcpy(req.ifr_name, ifname, sizeof req.ifr_name);
-			if (ioctl(s, SIOCGIFHWADDR, &req) == -1) {
-				e_free(a);
-				a = NULL;
-			} else
-				memcpy(a, req.ifr_addr.sa_data, sizeof(ether_addr_t));
+			strlcpy(req.ifr_name, ifname, sizeof req.ifr_name);
+			if (!ioctl(s, SIOCGIFHWADDR, &req)) {
+				a = e_malloc(sizeof(ether_addr_t));
+				if (a)
+					memcpy(a, req.ifr_addr.sa_data, sizeof(ether_addr_t));
+			}
 			break;
 		}
 #endif