emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vasprintf: do not use xmalloc, it will deadlock on OOM

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2013-02-07 16:06:54 +01:00
parent ba76b7a40b
commit b5fc51198b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libbb/platform.c
View File

@ -28,14 +28,16 @@ int FAST_FUNC vasprintf(char **string_ptr, const char *format, va_list p)
r = vsnprintf(buf, 128, format, p); r = vsnprintf(buf, 128, format, p);
va_end(p); va_end(p);
/* Note: can't use xstrdup/xmalloc, they call vasprintf (us) on failure! */
if (r < 128) { if (r < 128) {
va_end(p2); va_end(p2);
*string_ptr = xstrdup(buf); *string_ptr = strdup(buf);
return r; return r;
} }
*string_ptr = xmalloc(r+1); *string_ptr = malloc(r+1);
r = vsnprintf(*string_ptr, r+1, format, p2); r = (*string_ptr ? vsnprintf(*string_ptr, r+1, format, p2) : -1);
va_end(p2); va_end(p2);
return r; return r;