X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnetutl.c;h=8db252dd134c900933ed0a23fd897dace44084b4;hb=3fba80174dbe29bcfe0d121a2a1d2e61be5ee57b;hp=2d8de9e8c1836c500160b6de084a776506063b0f;hpb=d6c50eb73ad49bd2eac67214995dff76b7a20661;p=tinc

diff --git a/src/netutl.c b/src/netutl.c
index 2d8de9e8..8db252dd 100644
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -1,7 +1,7 @@
 /*
     netutl.c -- some supporting network utility code
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2011 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -93,8 +93,7 @@ void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr) {
 	if(err) {
 		logger(LOG_ERR, "Error while translating addresses: %s",
 			   gai_strerror(err));
-		raise(SIGFPE);
-		exit(0);
+		abort();
 	}
 
 	scopeid = strchr(address, '%');
@@ -102,8 +101,10 @@ void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr) {
 	if(scopeid)
 		*scopeid = '\0';		/* Descope. */
 
-	*addrstr = xstrdup(address);
-	*portstr = xstrdup(port);
+	if(addrstr)
+		*addrstr = xstrdup(address);
+	if(portstr)
+		*portstr = xstrdup(port);
 }
 
 char *sockaddr2hostname(const sockaddr_t *sa) {
@@ -153,8 +154,7 @@ int sockaddrcmp_noport(const sockaddr_t *a, const sockaddr_t *b) {
 		default:
 			logger(LOG_ERR, "sockaddrcmp() was called with unknown address family %d, exitting!",
 				   a->sa.sa_family);
-			raise(SIGFPE);
-			exit(0);
+			abort();
 	}
 }
 
@@ -197,8 +197,7 @@ int sockaddrcmp(const sockaddr_t *a, const sockaddr_t *b) {
 		default:
 			logger(LOG_ERR, "sockaddrcmp() was called with unknown address family %d, exitting!",
 				   a->sa.sa_family);
-			raise(SIGFPE);
-			exit(0);
+			abort();
 	}
 }