diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2013-02-07 16:06:54 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2013-02-07 16:06:54 +0100 |
| commit | b5fc51198bf451885e6411bae9b25890a5b6fbe2 (patch) | |
| tree | bd7f73b6fee12c29f896d5a126622de005ca2c89 | |
| parent | ba76b7a40b929878833731f76306b1c977cc8650 (diff) | |
| download | busybox-b5fc51198bf451885e6411bae9b25890a5b6fbe2.tar.gz | |
vasprintf: do not use xmalloc, it will deadlock on OOM
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | libbb/platform.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libbb/platform.c b/libbb/platform.c index 2bf34f5bc..d241d25a7 100644 --- a/libbb/platform.c +++ b/libbb/platform.c @@ -28,14 +28,16 @@ int FAST_FUNC vasprintf(char **string_ptr, const char *format, va_list p) r = vsnprintf(buf, 128, format, p); va_end(p); + /* Note: can't use xstrdup/xmalloc, they call vasprintf (us) on failure! */ + if (r < 128) { va_end(p2); - *string_ptr = xstrdup(buf); + *string_ptr = strdup(buf); return r; } - *string_ptr = xmalloc(r+1); - r = vsnprintf(*string_ptr, r+1, format, p2); + *string_ptr = malloc(r+1); + r = (*string_ptr ? vsnprintf(*string_ptr, r+1, format, p2) : -1); va_end(p2); return r; |