diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/util/nstring.c | 7 | ||||
-rw-r--r-- | lib/util/vasprintf.c | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/lib/util/nstring.c b/lib/util/nstring.c index ef47cbe1..bb2ba92e 100644 --- a/lib/util/nstring.c +++ b/lib/util/nstring.c @@ -791,9 +791,12 @@ pm_asprintf(const char ** const resultP, va_list varargs; #if HAVE_VASPRINTF + int rc; va_start(varargs, fmt); - vasprintf((char **)&result, fmt, varargs); + rc = vasprintf((char **)&result, fmt, varargs); va_end(varargs); + if (rc < 0) + result = pm_strsol; #else size_t dryRunLen; @@ -805,7 +808,7 @@ pm_asprintf(const char ** const resultP, if (dryRunLen + 1 < dryRunLen) /* arithmetic overflow */ - result = NULL; + result = pm_strsol; else { size_t const allocSize = dryRunLen + 1; char * buffer; diff --git a/lib/util/vasprintf.c b/lib/util/vasprintf.c index 209827eb..e38252fa 100644 --- a/lib/util/vasprintf.c +++ b/lib/util/vasprintf.c @@ -18,9 +18,11 @@ pm_vasprintf(const char ** const resultP, char * result; #if HAVE_VASPRINTF - vasprintf(&result, format, varargs); + int rc; - if (result == NULL) + rc = vasprintf(&result, format, varargs); + + if (rc < 0) *resultP = pm_strsol; else *resultP = result; |