diff options
| author |   jung <jung@openbsd.org> | 2016-05-22 19:19:21 +0000 |
|---|---|---|
| committer | jung <jung@openbsd.org> | 2016-05-22 19:19:21 +0000 |
| commit | 6b535b529336a3fd1beb56c42ff5755b84ba9b03 (patch) | |
| tree | 7852d105299c78877a0f9b5ecca6effa0460ba53 | |
| parent | Rename variable $action (which is actually global) to AI_MODE. (diff) | |
| download | wireguard-openbsd-6b535b529336a3fd1beb56c42ff5755b84ba9b03.tar.xz wireguard-openbsd-6b535b529336a3fd1beb56c42ff5755b84ba9b03.zip | |
fix unbalanced va_start and va_end macros
from Hiltjo Posthuma
"do." deraadt
| -rw-r--r-- | usr.sbin/httpd/httpd.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/usr.sbin/httpd/httpd.c b/usr.sbin/httpd/httpd.c index 797133d972b..37a2ea8edd6 100644 --- a/usr.sbin/httpd/httpd.c +++ b/usr.sbin/httpd/httpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: httpd.c,v 1.54 2016/02/02 17:51:11 sthen Exp $ */ +/* $OpenBSD: httpd.c,v 1.55 2016/05/22 19:19:21 jung Exp $ */ /* * Copyright (c) 2014 Reyk Floeter <reyk@openbsd.org> @@ -1000,11 +1000,13 @@ kv_set(struct kv *kv, char *fmt, ...) va_list ap; char *value = NULL; struct kv *ckv; + int ret; va_start(ap, fmt); - if (vasprintf(&value, fmt, ap) == -1) - return (-1); + ret = vasprintf(&value, fmt, ap); va_end(ap); + if (ret == -1) + return (-1); /* Remove all children */ while ((ckv = TAILQ_FIRST(&kv->kv_children)) != NULL) { @@ -1025,11 +1027,13 @@ kv_setkey(struct kv *kv, char *fmt, ...) { va_list ap; char *key = NULL; + int ret; va_start(ap, fmt); - if (vasprintf(&key, fmt, ap) == -1) - return (-1); + ret = vasprintf(&key, fmt, ap); va_end(ap); + if (ret == -1) + return (-1); free(kv->kv_key); kv->kv_key = key; |