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

Back out previous, free the buffer when __vfprintf() fails and don't bother

Browse Source 
trying to shrink the buffer with realloc() before returning it.
This commit is contained in:
tjr 2002-09-26 13:11:24 +00:00
parent 7733fef36f
commit 18a73315b6
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/libc/stdio/vasprintf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: vasprintf.c,v 1.6 1998/10/16 16:11:56 millert Exp $ */
/* $OpenBSD: vasprintf.c,v 1.4 1998/06/21 22:13:47 millert Exp $ */
/*
* Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
@ -44,32 +44,26 @@ vasprintf(str, fmt, ap)
int ret;
FILE f;
struct __sFILEX ext;
unsigned char *_base;
f._file = -1;
f._flags = __SWR | __SSTR | __SALC;
f._bf._base = f._p = (unsigned char *)malloc(128);
if (f._bf._base == NULL)
goto err;
if (f._bf._base == NULL) {
*str = NULL;
errno = ENOMEM;
return (-1);
}
f._bf._size = f._w = 127; /* Leave room for the NUL */
f._extra = &ext;
INITEXTRA(&f);
ret = __vfprintf(&f, fmt, ap);
if (ret == -1)
goto err;
*f._p = '\0';
_base = realloc(f._bf._base, ret + 1);
if (_base == NULL)
goto err;
*str = (char *)_base;
return (ret);
err:
if (f._bf._base != NULL) {
if (ret < 0) {
free(f._bf._base);
f._bf._base = NULL;
*str = NULL;
errno = ENOMEM;
return (-1);
}
*str = NULL;
errno = ENOMEM;
return (-1);
*f._p = '\0';
*str = (char *)f._bf._base;
return (ret);
}