aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/common.c1
-rw-r--r--src/common.h2
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])) \