From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 9 Sep 2004 01:58:35 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/fedora-base~86
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9d0cdc0eeaf8b0ca19bf04c5e18b00d965fcd0a8;p=platform%2Fupstream%2Fglibc.git

Update.

2004-09-08  Ulrich Drepper  <drepper@redhat.com>

	* malloc/malloc.c (_int_free): Add inexpensive double free test.
---

diff --git a/ChangeLog b/ChangeLog
index a906d61..c062399 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-08  Ulrich Drepper  <drepper@redhat.com>
+
+	* malloc/malloc.c (_int_free): Add inexpensive double free test.
+
 2004-09-08  Roland McGrath  <roland@redhat.com>
 
 	* malloc/mcheck.c: Don't use __P.
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 5636d5c..4db4051 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -4201,6 +4201,13 @@ _int_free(mstate av, Void_t* mem)
 
       set_fastchunks(av);
       fb = &(av->fastbins[fastbin_index(size)]);
+      /* Another simple check: make sure the top of the bin is not the
+	 record we are going to add (i.e., double free).  */
+      if (__builtin_expect (*fb == p, 0))
+	{
+	  malloc_printf_nc (check_action, "double free(%p)!\n", mem);
+	  return;
+	}
       p->fd = *fb;
       *fb = p;
     }