From 83de84b7f822a2211d81d9bb11d4a3e41588c364 Mon Sep 17 00:00:00 2001 From: okan Date: Wed, 22 Jan 2020 19:58:35 +0000 Subject: add, then use, xvasprintf, checking for appropriate return. --- xmalloc.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'xmalloc.c') diff --git a/xmalloc.c b/xmalloc.c index 9cf824a..69973de 100644 --- a/xmalloc.c +++ b/xmalloc.c @@ -91,11 +91,20 @@ xasprintf(char **ret, const char *fmt, ...) int i; va_start(ap, fmt); - i = vasprintf(ret, fmt, ap); + i = xvasprintf(ret, fmt, ap); va_end(ap); - if (i < 0 || *ret == NULL) - err(1, "asprintf"); + return(i); +} + +int +xvasprintf(char **ret, const char *fmt, va_list ap) +{ + int i; + + i = vasprintf(ret, fmt, ap); + if (i == -1) + err(1, "vasprintf"); return(i); } -- cgit 1.4.1