menubuilder: Use va_start/va_end around vsnprintf() on every call.
This commit is contained in:
parent
98f0be8dc3
commit
4db6d184b3
|
@ -236,13 +236,14 @@ static char* heap_printf(const char *format, ...)
|
||||||
char *buffer, *ret;
|
char *buffer, *ret;
|
||||||
int n;
|
int n;
|
||||||
|
|
||||||
va_start(args, format);
|
|
||||||
while (1)
|
while (1)
|
||||||
{
|
{
|
||||||
buffer = HeapAlloc(GetProcessHeap(), 0, size);
|
buffer = HeapAlloc(GetProcessHeap(), 0, size);
|
||||||
if (buffer == NULL)
|
if (buffer == NULL)
|
||||||
break;
|
break;
|
||||||
|
va_start(args, format);
|
||||||
n = vsnprintf(buffer, size, format, args);
|
n = vsnprintf(buffer, size, format, args);
|
||||||
|
va_end(args);
|
||||||
if (n == -1)
|
if (n == -1)
|
||||||
size *= 2;
|
size *= 2;
|
||||||
else if (n >= size)
|
else if (n >= size)
|
||||||
|
@ -251,7 +252,7 @@ static char* heap_printf(const char *format, ...)
|
||||||
break;
|
break;
|
||||||
HeapFree(GetProcessHeap(), 0, buffer);
|
HeapFree(GetProcessHeap(), 0, buffer);
|
||||||
}
|
}
|
||||||
va_end(args);
|
|
||||||
if (!buffer) return NULL;
|
if (!buffer) return NULL;
|
||||||
ret = HeapReAlloc(GetProcessHeap(), 0, buffer, strlen(buffer) + 1 );
|
ret = HeapReAlloc(GetProcessHeap(), 0, buffer, strlen(buffer) + 1 );
|
||||||
if (!ret) ret = buffer;
|
if (!ret) ret = buffer;
|
||||||
|
|
Loading…
Reference in New Issue