summaryrefslogtreecommitdiff
path: root/tests/xmalloc.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2025-10-18 19:07:35 +0200
committerJörg Frings-Fürst <debian@jff.email>2025-10-18 19:07:35 +0200
commitfa23d938c040bc8af305a31fa874df55b2a02576 (patch)
tree9704e2f7bd8962ea8911cd6f4e2d37227d7eff2e /tests/xmalloc.c
parentdf9dbf9b0915e432a4a2c4182f60af36374eaaab (diff)
parent693ae7b71dfdd1a8146266b5794a71c0dbe5dff0 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'tests/xmalloc.c')
-rw-r--r--tests/xmalloc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/xmalloc.c b/tests/xmalloc.c
index 5befdab7..8a715807 100644
--- a/tests/xmalloc.c
+++ b/tests/xmalloc.c
@@ -1,6 +1,6 @@
/* xmalloc.c -- malloc with out of memory checking
- Copyright (C) 1990-2000, 2002-2006, 2008-2024 Free Software Foundation, Inc.
+ Copyright (C) 1990-2000, 2002-2006, 2008-2025 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -64,7 +64,7 @@ void *
xrealloc (void *p, size_t s)
{
void *r = realloc (p, s);
- if (!r && (!p || s))
+ if (!r)
xalloc_die ();
return r;
}
@@ -82,7 +82,7 @@ void *
xreallocarray (void *p, size_t n, size_t s)
{
void *r = reallocarray (p, n, s);
- if (!r && (!p || (n && s)))
+ if (!r)
xalloc_die ();
return r;
}