[v6,2/3] support: Add xreallocarray
Checks
Context |
Check |
Description |
dj/TryBot-apply_patch |
success
|
Patch applied to master at the time it was sent
|
Commit Message
As a wrapper over reallocarray.
---
support/Makefile | 1 +
support/support.h | 2 ++
support/xreallocarray.c | 29 +++++++++++++++++++++++++++++
3 files changed, 32 insertions(+)
create mode 100644 support/xreallocarray.c
Comments
* Adhemerval Zanella:
> +void *
> +xreallocarray (void *p, size_t n, size_t s)
> +{
> + void *r = reallocarray (p, n, s);
> + if (r == NULL)
> + oom_error ("reallocarray", n);
> + return r;
> +}
Isn't the failure condition more complicated? See xrealloc.
Thanks,
Florian
On 10/03/23 13:49, Florian Weimer wrote:
> * Adhemerval Zanella:
>
>> +void *
>> +xreallocarray (void *p, size_t n, size_t s)
>> +{
>> + void *r = reallocarray (p, n, s);
>> + if (r == NULL)
>> + oom_error ("reallocarray", n);
>> + return r;
>> +}
>
> Isn't the failure condition more complicated? See xrealloc.
Indeed, I will update the patch.
On 2023-03-10 10:44, Adhemerval Zanella Netto wrote:
>
>
> On 10/03/23 13:49, Florian Weimer wrote:
>> * Adhemerval Zanella:
>>
>>> +void *
>>> +xreallocarray (void *p, size_t n, size_t s)
>>> +{
>>> + void *r = reallocarray (p, n, s);
>>> + if (r == NULL)
>>> + oom_error ("reallocarray", n);
>>> + return r;
>>> +}
>>
>> Isn't the failure condition more complicated? See xrealloc.
>
> Indeed, I will update the patch.
You can steal the source code from Gnulib, which already has
xreallocarray in lib/xmalloc.c.
(Gnulib also has an xireallocarray which is better if you're worried
about integer overflow, but one step at a time.)
@@ -191,6 +191,7 @@ libsupport-routines = \
xraise \
xreadlink \
xrealloc \
+ xreallocarray \
xrecvfrom \
xsendto \
xsetlocale \
@@ -107,6 +107,8 @@ extern void *xcalloc (size_t n, size_t s)
__returns_nonnull;
extern void *xrealloc (void *o, size_t n)
__attribute_malloc__ __attribute_alloc_size__ ((2)) __attr_dealloc_free;
+extern void *xreallocarray (void *p, size_t n, size_t s)
+ __attribute_alloc_size__ ((2, 3)) __attr_dealloc_free;
extern char *xstrdup (const char *) __attribute_malloc__ __attr_dealloc_free
__returns_nonnull;
void *xposix_memalign (size_t alignment, size_t n)
new file mode 100644
@@ -0,0 +1,29 @@
+/* Error-checking wrapper for reallocarray
+ Copyright (C) 2016-2023 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <stdlib.h>
+#include <support/support.h>
+
+void *
+xreallocarray (void *p, size_t n, size_t s)
+{
+ void *r = reallocarray (p, n, s);
+ if (r == NULL)
+ oom_error ("reallocarray", n);
+ return r;
+}