From 5b62e382c2e894e124ac6640e28397946b775765 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Wed, 21 May 2008 18:07:29 +0000 Subject: [PATCH] Don't assume realloc() can handle NULL pointers (backport from trunk) --- ChangeLog | 4 ++++ sbr/utils.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index e9d73d3..507c457 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2008-05-21 Peter Maydell + * sbr/utils.c (mh_xrealloc): don't assume realloc() can + handle NULL pointers; some non-POSIX realloc()s can't. + (Ported from trunk.) + * sbr/dtimep.lex: add some table size declarations for the benefit of elderly lexes with small defaults. (Ported from trunk.) diff --git a/sbr/utils.c b/sbr/utils.c index d822995..7c4ddcf 100644 --- a/sbr/utils.c +++ b/sbr/utils.c @@ -47,6 +47,10 @@ mh_xrealloc(void *ptr, size_t size) { void *memory; + /* Some non-POSIX realloc()s don't cope with realloc(NULL,sz) */ + if (!ptr) + return mh_xmalloc(size); + if (size == 0) adios(NULL, "Tried to realloc 0bytes"); -- 1.7.10.4