aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Oliva <aoliva@redhat.com>2012-12-15 10:24:50 +0000
committerAlexandre Oliva <aoliva@gcc.gnu.org>2012-12-15 10:24:50 +0000
commit5a6fe81088b9a7e5242897892239b745d9273cf9 (patch)
treeb7f3913d1436aa01e9834b9804456cf9a514703e
parent1c9597213362d8fc5fe58016a5790bd331c1c997 (diff)
downloadgcc-5a6fe81088b9a7e5242897892239b745d9273cf9.zip
gcc-5a6fe81088b9a7e5242897892239b745d9273cf9.tar.gz
gcc-5a6fe81088b9a7e5242897892239b745d9273cf9.tar.bz2
* mf-hooks1.c (free): Return on NULL before any logging.
From-SVN: r194518
-rw-r--r--libmudflap/ChangeLog4
-rw-r--r--libmudflap/mf-hooks1.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/libmudflap/ChangeLog b/libmudflap/ChangeLog
index 8956c3c..a5f05f6 100644
--- a/libmudflap/ChangeLog
+++ b/libmudflap/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-15 Alexandre Oliva <aoliva@redhat.com>
+
+ * mf-hooks1.c (free): Return on NULL before any logging.
+
2012-09-14 David Edelsohn <dje.gcc@gmail.com>
* configure: Regenerated.
diff --git a/libmudflap/mf-hooks1.c b/libmudflap/mf-hooks1.c
index 3dd332e..7a27321 100644
--- a/libmudflap/mf-hooks1.c
+++ b/libmudflap/mf-hooks1.c
@@ -238,11 +238,11 @@ WRAPPER(void, free, void *buf)
static int freeq_initialized = 0;
DECLARE(void, free, void *);
- BEGIN_PROTECT (free, buf);
-
if (UNLIKELY(buf == NULL))
return;
+ BEGIN_PROTECT (free, buf);
+
#if PIC
/* Check whether the given buffer might have come from a
__mf_0fn_malloc/calloc call that for whatever reason was not