Minor fixes

1 files changed, 6 insertions, 6 deletions

diff --git a/src/listener.c b/src/listener.c
index 2960dab..230205b 100644
--- a/src/listener.c
+++ b/src/listener.c
@@ -292,13 +292,13 @@ listeners_cleanup()
 void
 listener_kve_init(char **kve, int kvn, listener_t *lp, ...)
 {
         int i = 0;
         static char linebuf[64];
         va_list ap;
-        char *p;
+        char *kw, *val;
         
         if (kvn < KVE_MINSIZE) {
                 diag(LOG_CRIT, "%s:%d: INTERNAL ERROR", __FILE__, __LINE__);
                 abort();
         }
         
@@ -310,20 +310,20 @@ listener_kve_init(char **kve, int kvn, listener_t *lp, ...)
 
         kve[i++] = "line";
         snprintf(linebuf, sizeof(linebuf), "%u", lp->locus.beg.line);
         kve[i++] = linebuf;
 
         va_start(ap, lp);
-        while ((p = va_arg(ap,char*))) {
-                if (i == kvn) {
+        while ((kw = va_arg(ap,char*)) && (val = va_arg(ap,char*))) {
+                if (i + 2 >= kvn) {
                         diag(LOG_CRIT, "%s:%d: INTERNAL ERROR",
                              __FILE__, __LINE__);
                         abort();
                 }
-                if (p)
-                        kve[i++] = p;
+                kve[i++] = kw;
+                kve[i++] = val;
         }
         va_end(ap);
         kve[i] = NULL;
 }
 
 static char *event_str[] = {
@@ -474,13 +474,13 @@ listener_print_status(listener_t *lp)
         lp->status = stat_down;
 } 
 
 static int
 runaction(listener_t *lp, action_t *act, event_t *evt)
 {
-        char *kve[KVE_MINSIZE + 7];
+        char *kve[KVE_MINSIZE + 8];
         char codebuf[64];
         char statbuf[64];
         char pidbuf[80], *pid;
         
         snprintf(statbuf, sizeof(statbuf), "%u", lp->progstat);
         snprintf(codebuf, sizeof(codebuf), "%u", evt->code);