X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxmalloc.c;h=318e0ddb5a70120f8949f4a0a588c143fcfa7dd5;hb=cb07569c0de7172006a6dcf94adc5658fdaa523c;hp=8217c992d7ac7ab6365cd3dff8a1bc66aff38aff;hpb=8bc2863c9a53466fda8f50603df297df9233c285;p=gnulib.git diff --git a/lib/xmalloc.c b/lib/xmalloc.c index 8217c992d..318e0ddb5 100644 --- a/lib/xmalloc.c +++ b/lib/xmalloc.c @@ -1,5 +1,8 @@ /* xmalloc.c -- malloc with out of memory checking - Copyright (C) 1990, 91, 92, 93, 94, 95, 96 Free Software Foundation, Inc. + + Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, + 1999, 2000, 2002, 2003, 2004, 2005, 2006 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 @@ -13,117 +16,108 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H -# include -#endif +#include -#if __STDC__ -# define VOID void -#else -# define VOID char +#if ! HAVE_INLINE +# define static_inline #endif +#include "xalloc.h" +#undef static_inline -#include +#include +#include -#if STDC_HEADERS -# include -#else -VOID *calloc (); -VOID *malloc (); -VOID *realloc (); -void free (); +#ifndef SIZE_MAX +# define SIZE_MAX ((size_t) -1) #endif -#if ENABLE_NLS -# include -# define _(Text) gettext (Text) +/* 1 if calloc is known to be compatible with GNU calloc. This + matters if we are not also using the calloc module, which defines + HAVE_CALLOC and supports the GNU API even on non-GNU platforms. */ +#if defined HAVE_CALLOC || defined __GLIBC__ +enum { HAVE_GNU_CALLOC = 1 }; #else -# define textdomain(Domain) -# define _(Text) Text +enum { HAVE_GNU_CALLOC = 0 }; #endif -#include "error.h" - -#ifndef EXIT_FAILURE -# define EXIT_FAILURE 1 -#endif +/* Allocate N bytes of memory dynamically, with error checking. */ -/* Prototypes for functions defined here. */ -#if defined (__STDC__) && __STDC__ -static VOID *fixup_null_alloc (size_t n); -VOID *xmalloc (size_t n); -VOID *xcalloc (size_t n, size_t s); -VOID *xrealloc (VOID *p, size_t n); -#endif +void * +xmalloc (size_t n) +{ + void *p = malloc (n); + if (!p && n != 0) + xalloc_die (); + return p; +} +/* Change the size of an allocated block of memory P to N bytes, + with error checking. */ -/* Exit value when the requested amount of memory is not available. - The caller may set it to some other value. */ -int xmalloc_exit_failure = EXIT_FAILURE; +void * +xrealloc (void *p, size_t n) +{ + p = realloc (p, n); + if (!p && n != 0) + xalloc_die (); + return p; +} -#if __STDC__ && (HAVE_VPRINTF || HAVE_DOPRNT) -void error (int, int, const char *, ...); -#else -void error (); -#endif +/* If P is null, allocate a block of at least *PN bytes; otherwise, + reallocate P so that it contains more than *PN bytes. *PN must be + nonzero unless P is null. Set *PN to the new block's size, and + return the pointer to the new block. *PN is never set to zero, and + the returned pointer is never null. */ -static VOID * -fixup_null_alloc (n) - size_t n; +void * +x2realloc (void *p, size_t *pn) { - VOID *p; - - p = 0; - if (n == 0) - p = malloc ((size_t) 1); - if (p == 0) - error (xmalloc_exit_failure, 0, _("Memory exhausted")); - return p; + return x2nrealloc (p, pn, 1); } -/* Allocate N bytes of memory dynamically, with error checking. */ +/* Allocate S bytes of zeroed memory dynamically, with error checking. + There's no need for xnzalloc (N, S), since it would be equivalent + to xcalloc (N, S). */ -VOID * -xmalloc (n) - size_t n; +void * +xzalloc (size_t s) { - VOID *p; + return memset (xmalloc (s), 0, s); +} - p = malloc (n); - if (p == 0) - p = fixup_null_alloc (n); +/* Allocate zeroed memory for N elements of S bytes, with error + checking. S must be nonzero. */ + +void * +xcalloc (size_t n, size_t s) +{ + void *p; + /* Test for overflow, since some calloc implementations don't have + proper overflow checks. But omit overflow and size-zero tests if + HAVE_GNU_CALLOC, since GNU calloc catches overflow and never + returns NULL if successful. */ + if ((! HAVE_GNU_CALLOC && xalloc_oversized (n, s)) + || (! (p = calloc (n, s)) && (HAVE_GNU_CALLOC || n != 0))) + xalloc_die (); return p; } -/* Allocate memory for N elements of S bytes, with error checking. */ +/* Clone an object P of size S, with error checking. There's no need + for xnmemdup (P, N, S), since xmemdup (P, N * S) works without any + need for an arithmetic overflow check. */ -VOID * -xcalloc (n, s) - size_t n, s; +void * +xmemdup (void const *p, size_t s) { - VOID *p; - - p = calloc (n, s); - if (p == 0) - p = fixup_null_alloc (n); - return p; + return memcpy (xmalloc (s), p, s); } -/* Change the size of an allocated block of memory P to N bytes, - with error checking. - If P is NULL, run xmalloc. */ +/* Clone STRING. */ -VOID * -xrealloc (p, n) - VOID *p; - size_t n; +char * +xstrdup (char const *string) { - if (p == 0) - return xmalloc (n); - p = realloc (p, n); - if (p == 0) - p = fixup_null_alloc (n); - return p; + return xmemdup (string, strlen (string) + 1); }