diff options
author | Mattias Andrée <maandree@member.fsf.org> | 2016-01-01 23:44:08 +0100 |
---|---|---|
committer | Mattias Andrée <maandree@member.fsf.org> | 2016-01-01 23:44:08 +0100 |
commit | c43ae0e00ab6f37452ddc4128dc82a5da721f0ad (patch) | |
tree | 8602180289879df9c95cc37a90e5f97385cd188b | |
parent | m (diff) | |
download | sat-c43ae0e00ab6f37452ddc4128dc82a5da721f0ad.tar.gz sat-c43ae0e00ab6f37452ddc4128dc82a5da721f0ad.tar.bz2 sat-c43ae0e00ab6f37452ddc4128dc82a5da721f0ad.tar.xz |
bug fix
Signed-off-by: Mattias Andrée <maandree@member.fsf.org>
-rw-r--r-- | src/common.c | 1 | ||||
-rw-r--r-- | src/common.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/common.c b/src/common.c index a6f4c7c..6423937 100644 --- a/src/common.c +++ b/src/common.c @@ -417,6 +417,7 @@ poke_daemon(int start, const char *name) t (read(fd, &pid, sizeof(pid)) < (ssize_t)sizeof(pid)); close(fd), fd = -1; } + free(path), path = NULL; /* Start daemon if not running, otherwise poke it. */ if (start) { diff --git a/src/common.h b/src/common.h index 92dbaf4..0808e11 100644 --- a/src/common.h +++ b/src/common.h @@ -181,7 +181,7 @@ const char *argv0 = name; #define NO_OPTIONS \ do { \ int i; \ - if (!strcmp(argv[1], "--")) \ + if ((argc > 1) && !strcmp(argv[1], "--")) \ argv++, argc--; \ for (i = 1; i < argc; i++) \ if (strchr("-", argv[i][0])) \ |