Merge branch 'master' into 1.1

[meshlink] / src / netutl.c

diff --git a/src/netutl.c b/src/netutl.c
index 2d8de9e8c1836c500160b6de084a776506063b0f..8ad2ce99ea94a118a0c3d85233c1183b0ae483ca 100644 (file)
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -102,8 +102,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) {