From 2f5f40f465c5c1af651727e756fd007fd11f2236 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sat, 22 Dec 2012 17:24:44 +0100 Subject: mtrace: properly handle realloc (p, 0) --- ChangeLog | 6 ++++++ malloc/mtrace.c | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f46eba3ee..2611e75814 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-01-03 Andreas Schwab + + [BZ #14981] + * malloc/mtrace.c (tr_reallochook): If realloc returns NULL when + size is zero, record memory as freed. + 2013-01-03 Andreas Jaeger * po/ia.po: Add new Interlingua translation. diff --git a/malloc/mtrace.c b/malloc/mtrace.c index af3b7f8ada..e9ccfa299d 100644 --- a/malloc/mtrace.c +++ b/malloc/mtrace.c @@ -219,8 +219,13 @@ tr_reallochook (ptr, size, caller) tr_where (caller, info); if (hdr == NULL) - /* Failed realloc. */ - fprintf (mallstream, "! %p %#lx\n", ptr, (unsigned long int) size); + { + if (size != 0) + /* Failed realloc. */ + fprintf (mallstream, "! %p %#lx\n", ptr, (unsigned long int) size); + else + fprintf (mallstream, "- %p\n", ptr); + } else if (ptr == NULL) fprintf (mallstream, "+ %p %#lx\n", hdr, (unsigned long int) size); else -- cgit 1.4.1