Fix warnings from the Clang static analyzer.

[tinc] / src / tincctl.c

diff --git a/src/tincctl.c b/src/tincctl.c
index e42ec2c..a0a7633 100644 (file)
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -560,6 +560,7 @@ bool sendline(int fd, char *format, ...) {
 
        va_start(ap, format);
        blen = vsnprintf(buffer, sizeof buffer, format, ap);
+       buffer[sizeof buffer - 1] = 0;
        va_end(ap);
 
        if(blen < 1 || blen >= sizeof buffer)
@@ -718,6 +719,13 @@ bool connect_tincd(bool verbose) {
        }
 
        fclose(f);
+       if ((pid == 0) || (kill(pid, 0) && (errno == ESRCH))) {
+               fprintf(stderr, "Could not find tincd running at pid %d\n", pid);
+               /* clean up the stale socket and pid file */
+               unlink(pidfilename);
+               unlink(unixsocketname);
+               return false;
+       }
 
 #ifndef HAVE_MINGW
        struct sockaddr_un sa;
@@ -878,7 +886,7 @@ static int cmd_start(int argc, char *argv[]) {
 
        if(!pid) {
                close(pfd[0]);
-               char buf[100] = "";
+               char buf[100];
                snprintf(buf, sizeof buf, "%d", pfd[1]);
                setenv("TINC_UMBILICAL", buf, true);
                exit(execvp(c, nargv));
@@ -1384,7 +1392,7 @@ static int cmd_pid(int argc, char *argv[]) {
                return 1;
        }
 
-       if(!connect_tincd(true) && !pid)
+       if(!connect_tincd(true) || !pid)
                return 1;
 
        printf("%d\n", pid);