aboutsummaryrefslogtreecommitdiff
path: root/gnulib/import/malloc.c
diff options
context:
space:
mode:
authorTom Tromey <tromey@adacore.com>2022-04-18 09:44:18 -0600
committerTom Tromey <tromey@adacore.com>2022-04-18 10:14:04 -0600
commitdc6c21dabfbd242616b9e6266b459eded2d0762b (patch)
treeb2fbadbdbcd20dfa3f9dfe179db1c348e2aa5901 /gnulib/import/malloc.c
parent2390419d1cb72882110538e01e5586372df19657 (diff)
downloadbinutils-dc6c21dabfbd242616b9e6266b459eded2d0762b.zip
binutils-dc6c21dabfbd242616b9e6266b459eded2d0762b.tar.gz
binutils-dc6c21dabfbd242616b9e6266b459eded2d0762b.tar.bz2
Update gnulib
This updates gnulib to a relatively recent commit. Most of this was done by the gnulib import script; the only change I made was to update-gnulib.sh. Tested on x86-64 Fedora 34. I also did a mingw cross build.
Diffstat (limited to 'gnulib/import/malloc.c')
-rw-r--r--gnulib/import/malloc.c43
1 files changed, 19 insertions, 24 deletions
diff --git a/gnulib/import/malloc.c b/gnulib/import/malloc.c
index b59e64b..f334dd6 100644
--- a/gnulib/import/malloc.c
+++ b/gnulib/import/malloc.c
@@ -1,51 +1,46 @@
/* malloc() function that is glibc compatible.
- Copyright (C) 1997-1998, 2006-2007, 2009-2021 Free Software Foundation, Inc.
+ Copyright (C) 1997-1998, 2006-2007, 2009-2022 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
- the Free Software Foundation; either version 3, or (at your option)
- any later version.
+ This file 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.
- This program is distributed in the hope that it will be useful,
+ This file 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 General Public License for more details.
+ GNU Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, see <https://www.gnu.org/licenses/>. */
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>. */
/* written by Jim Meyering and Bruno Haible */
#define _GL_USE_STDLIB_ALLOC 1
#include <config.h>
-/* Only the AC_FUNC_MALLOC macro defines 'malloc' already in config.h. */
-#ifdef malloc
-# define NEED_MALLOC_GNU 1
-# undef malloc
-/* Whereas the gnulib module 'malloc-gnu' defines HAVE_MALLOC_GNU. */
-#elif GNULIB_MALLOC_GNU && !HAVE_MALLOC_GNU
-# define NEED_MALLOC_GNU 1
-#endif
#include <stdlib.h>
#include <errno.h>
-/* Allocate an N-byte block of memory from the heap.
- If N is zero, allocate a 1-byte block. */
+#include "xalloc-oversized.h"
+
+/* Allocate an N-byte block of memory from the heap, even if N is 0. */
void *
rpl_malloc (size_t n)
{
- void *result;
-
-#if NEED_MALLOC_GNU
if (n == 0)
n = 1;
-#endif
- result = malloc (n);
+ if (xalloc_oversized (n, 1))
+ {
+ errno = ENOMEM;
+ return NULL;
+ }
+
+ void *result = malloc (n);
#if !HAVE_MALLOC_POSIX
if (result == NULL)