From: Pádraig Brady Date: Mon, 19 Jan 2026 14:17:33 +0000 (+0000) Subject: xalloc: use check_nonnull() in more places X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7337ab58598056686e764c1ec3345fc935888af8;p=thirdparty%2Fgnulib.git xalloc: use check_nonnull() in more places * lib/xmalloc.c (xrealloc, xreallocarray): Use check_nonnull(). --- diff --git a/ChangeLog b/ChangeLog index 72b1eaa5c7..27f0a53803 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2026-01-19 Pádraig Brady + + xalloc: use check_nonnull() in more places + * lib/xmalloc.c (xrealloc, xreallocarray): Use check_nonnull(). + 2026-01-19 Pádraig Brady xalloc: fix possible elimination of NULL checks diff --git a/lib/xmalloc.c b/lib/xmalloc.c index b889004381..f00ea5e7a4 100644 --- a/lib/xmalloc.c +++ b/lib/xmalloc.c @@ -72,10 +72,7 @@ xcharalloc (size_t n) void * xrealloc (void *p, size_t s) { - void *r = realloc (p, s); - if (!r) - xalloc_die (); - return r; + return check_nonnull (realloc (p, s)); } void * @@ -90,10 +87,7 @@ xirealloc (void *p, idx_t s) void * xreallocarray (void *p, size_t n, size_t s) { - void *r = reallocarray (p, n, s); - if (!r) - xalloc_die (); - return r; + return check_nonnull (reallocarray (p, n, s)); } void *