summaryrefslogtreecommitdiffstats
path: root/gl/malloc.c
diff options
context:
space:
mode:
authorLorenz <12514511+RincewindsHat@users.noreply.github.com>2023-03-11 10:34:47 (GMT)
committerGitHub <noreply@github.com>2023-03-11 10:34:47 (GMT)
commit75342b53853a898bdd93c7d3da9374115bab6b6d (patch)
tree0c0af2b796bcdd8ddd42187beb5badb420db8dea /gl/malloc.c
parent6bbe0b7b0f609ecab831dec9be7690842bf0a0fc (diff)
parent357787868b5201ec3e874e7a225b1c944cbbdb4d (diff)
downloadmonitoring-plugins-75342b53853a898bdd93c7d3da9374115bab6b6d.tar.gz
Merge branch 'master' into patch-1refs/pull/1842/head
Diffstat (limited to 'gl/malloc.c')
-rw-r--r--gl/malloc.c43
1 files changed, 19 insertions, 24 deletions
diff --git a/gl/malloc.c b/gl/malloc.c
index 908735d..3ade35c 100644
--- a/gl/malloc.c
+++ b/gl/malloc.c
@@ -1,51 +1,46 @@
1/* malloc() function that is glibc compatible. 1/* malloc() function that is glibc compatible.
2 2
3 Copyright (C) 1997-1998, 2006-2007, 2009-2013 Free Software Foundation, Inc. 3 Copyright (C) 1997-1998, 2006-2007, 2009-2023 Free Software Foundation, Inc.
4 4
5 This program is free software; you can redistribute it and/or modify 5 This file is free software: you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU Lesser General Public License as
7 the Free Software Foundation; either version 3, or (at your option) 7 published by the Free Software Foundation; either version 2.1 of the
8 any later version. 8 License, or (at your option) any later version.
9 9
10 This program is distributed in the hope that it will be useful, 10 This file is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 13 GNU Lesser General Public License for more details.
14 14
15 You should have received a copy of the GNU General Public License 15 You should have received a copy of the GNU Lesser General Public License
16 along with this program; if not, see <http://www.gnu.org/licenses/>. */ 16 along with this program. If not, see <https://www.gnu.org/licenses/>. */
17 17
18/* written by Jim Meyering and Bruno Haible */ 18/* written by Jim Meyering and Bruno Haible */
19 19
20#define _GL_USE_STDLIB_ALLOC 1 20#define _GL_USE_STDLIB_ALLOC 1
21#include <config.h> 21#include <config.h>
22/* Only the AC_FUNC_MALLOC macro defines 'malloc' already in config.h. */
23#ifdef malloc
24# define NEED_MALLOC_GNU 1
25# undef malloc
26/* Whereas the gnulib module 'malloc-gnu' defines HAVE_MALLOC_GNU. */
27#elif GNULIB_MALLOC_GNU && !HAVE_MALLOC_GNU
28# define NEED_MALLOC_GNU 1
29#endif
30 22
31#include <stdlib.h> 23#include <stdlib.h>
32 24
33#include <errno.h> 25#include <errno.h>
34 26
35/* Allocate an N-byte block of memory from the heap. 27#include "xalloc-oversized.h"
36 If N is zero, allocate a 1-byte block. */ 28
29/* Allocate an N-byte block of memory from the heap, even if N is 0. */
37 30
38void * 31void *
39rpl_malloc (size_t n) 32rpl_malloc (size_t n)
40{ 33{
41 void *result;
42
43#if NEED_MALLOC_GNU
44 if (n == 0) 34 if (n == 0)
45 n = 1; 35 n = 1;
46#endif
47 36
48 result = malloc (n); 37 if (xalloc_oversized (n, 1))
38 {
39 errno = ENOMEM;
40 return NULL;
41 }
42
43 void *result = malloc (n);
49 44
50#if !HAVE_MALLOC_POSIX 45#if !HAVE_MALLOC_POSIX
51 if (result == NULL) 46 if (result == NULL)