d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct more cases of allocation size bookkeeping being updated before

Browse Source 
calling functions which can potentially fail and cause cleanups to be
invoked.

Submitted by:	Solar Designer <solar@openwall.com>
This commit is contained in:
Jacques Vidrine 2003-09-17 14:36:14 +00:00
parent 8947bcb756
commit 454412956c
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/openssh/deattack.c
View File

@ -100,12 +100,12 @@ detect_attack(u_char *buf, u_int32_t len, u_char *IV)
if (h == NULL) { if (h == NULL) {
debug("Installing crc compensation attack detector."); debug("Installing crc compensation attack detector.");
h = (u_int16_t *) xmalloc(l * HASH_ENTRYSIZE);
n = l; n = l;
h = (u_int16_t *) xmalloc(n * HASH_ENTRYSIZE);
} else { } else {
if (l > n) { if (l > n) {
h = (u_int16_t *) xrealloc(h, l * HASH_ENTRYSIZE);
n = l; n = l;
h = (u_int16_t *) xrealloc(h, n * HASH_ENTRYSIZE);
} }
} }

11
crypto/openssh/misc.c
View File

@ -308,18 +308,21 @@ addargs(arglist *args, char *fmt, ...)
{ {
va_list ap; va_list ap;
char buf[1024]; char buf[1024];
int nalloc;
va_start(ap, fmt); va_start(ap, fmt);
vsnprintf(buf, sizeof(buf), fmt, ap); vsnprintf(buf, sizeof(buf), fmt, ap);
va_end(ap); va_end(ap);
nalloc = args->nalloc;
if (args->list == NULL) { if (args->list == NULL) {
args->nalloc = 32; nalloc = 32;
args->num = 0; args->num = 0;
} else if (args->num+2 >= args->nalloc) } else if (args->num+2 >= nalloc)
args->nalloc *= 2; 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++] = xstrdup(buf);
args->list[args->num] = NULL; args->list[args->num] = NULL;
} }