Fix: getaddrinfo misuse

Closes #129
zehome · Mar 29, 2020 · 49e1aca · 49e1aca
1 parent 80392b5
commit 49e1aca
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/control.c b/src/control.c
@@ -186,7 +186,7 @@ mlvpn_control_init(struct mlvpn_control *ctrl)
         ret = priv_getaddrinfo(ctrl->bindaddr, ctrl->bindport,
                                &res, &hints);
         bak = res;
-        if (ret < 0 || ! res)
+        if (ret <= 0 || ! res)
         {
             log_warnx("control", "priv_getaddrinfo(%s,%s) failed: %s",
                    ctrl->bindaddr, ctrl->bindport,

diff --git a/src/mlvpn.c b/src/mlvpn.c
@@ -784,7 +784,7 @@ mlvpn_rtun_bind(mlvpn_tunnel_t *t)
     hints.ai_socktype = SOCK_DGRAM;
 
     n = priv_getaddrinfo(t->bindaddr, t->bindport, &res, &hints);
-    if (n < 0)
+    if (n <= 0)
     {
         log_warnx(NULL, "%s getaddrinfo error: %s", t->name, gai_strerror(n));
         return -1;
@@ -828,7 +828,7 @@ mlvpn_rtun_start(mlvpn_tunnel_t *t)
     hints.ai_socktype = SOCK_DGRAM;
 
     ret = priv_getaddrinfo(addr, port, &t->addrinfo, &hints);
-    if (ret < 0 || !t->addrinfo)
+    if (ret <= 0 || !t->addrinfo)
     {
         log_warnx("dns", "%s getaddrinfo(%s,%s) failed: %s",
            t->name, addr, port, gai_strerror(ret));

diff --git a/src/privsep.c b/src/privsep.c
@@ -116,7 +116,7 @@ priv_init(char *argv[], char *username)
     struct sigaction sa;
     struct addrinfo hints, *res0, *res;
     char hostname[MLVPN_MAXHNAMSTR], servname[MLVPN_MAXHNAMSTR];
-    char *phostname, *pservname;
+    char *phostname, *pservname = NULL;
     char script_path[MAXPATHLEN] = {0};
     char tuntapname[MLVPN_IFNAMSIZ];
     char **script_argv;
@@ -339,7 +339,7 @@ priv_init(char *argv[], char *username)
             else if (hostname_len > 0) {
                 must_read(socks[0], &hostname, hostname_len);
                 hostname[hostname_len - 1] = '\0';
-                phostname = hostname;
+                phostname = *hostname ? hostname : NULL;
             } else {
                 phostname = NULL;
             }
@@ -350,7 +350,7 @@ priv_init(char *argv[], char *username)
             if (servname_len > 0) {
                 must_read(socks[0], &servname, servname_len);
                 servname[servname_len - 1] = '\0';
-                pservname = servname;
+                pservname = *servname ? servname : NULL;
             } else {
                 pservname = NULL;
             }