From a8cd7705e7898d77764aa12ddcc2e29de1860138 Mon Sep 17 00:00:00 2001 From: Ton Voon Date: Thu, 18 May 2006 22:05:43 +0000 Subject: Synchronise with coreutils 2.95. Gettext now synced with coreutils, so no longer development platform requirement git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1394 f882894a-f735-0410-b71e-b25c423dba1c --- lib/realloc.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'lib/realloc.c') diff --git a/lib/realloc.c b/lib/realloc.c index ccbf9913..fe948222 100644 --- a/lib/realloc.c +++ b/lib/realloc.c @@ -1,5 +1,5 @@ -/* Work around bug on some systems where realloc (NULL, 0) fails. - Copyright (C) 1997, 2003 Free Software Foundation, Inc. +/* realloc() function that is glibc compatible. + Copyright (C) 1997, 2003, 2004 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,11 +13,11 @@ 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. */ /* written by Jim Meyering */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif #undef realloc @@ -32,8 +32,15 @@ void * rpl_realloc (void *p, size_t n) { if (n == 0) - n = 1; - if (p == 0) + { + n = 1; + + /* In theory realloc might fail, so don't rely on it to free. */ + free (p); + p = NULL; + } + + if (p == NULL) return malloc (n); return realloc (p, n); } -- cgit v1.2.3-74-g34f1