From 0689a1c0d3a7bf6f827a1f7ee07bdb8d1e3c1fb1 Mon Sep 17 00:00:00 2001 From: nectar Date: Wed, 17 Sep 2003 14:36:14 +0000 Subject: Correct more cases of allocation size bookkeeping being updated before calling functions which can potentially fail and cause cleanups to be invoked. Submitted by: Solar Designer --- crypto/openssh/misc.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'crypto/openssh/misc.c') diff --git a/crypto/openssh/misc.c b/crypto/openssh/misc.c index 512fb22..84c94f9 100644 --- a/crypto/openssh/misc.c +++ b/crypto/openssh/misc.c @@ -308,18 +308,21 @@ addargs(arglist *args, char *fmt, ...) { va_list ap; char buf[1024]; + int nalloc; va_start(ap, fmt); vsnprintf(buf, sizeof(buf), fmt, ap); va_end(ap); + nalloc = args->nalloc; if (args->list == NULL) { - args->nalloc = 32; + nalloc = 32; args->num = 0; - } else if (args->num+2 >= args->nalloc) - args->nalloc *= 2; + } else if (args->num+2 >= nalloc) + nalloc *= 2; - args->list = xrealloc(args->list, args->nalloc * sizeof(char *)); + args->list = xrealloc(args->list, nalloc * sizeof(char *)); + args->nalloc = nalloc; args->list[args->num++] = xstrdup(buf); args->list[args->num] = NULL; } -- cgit v1.1