This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch, master, updated. glibc-2.11-194-g2c2243f


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  2c2243f7081f66542249cf990d8444105000077b (commit)
      from  0ee5660b7c592aa41a8e86e801c379864f9489a4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=2c2243f7081f66542249cf990d8444105000077b

commit 2c2243f7081f66542249cf990d8444105000077b
Author: Ulrich Drepper <drepper@redhat.com>
Date:   Wed Feb 10 00:04:49 2010 -0800

    Undo unintended maloc change.

diff --git a/malloc/malloc.c b/malloc/malloc.c
index acf1bec..b43e454 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -1,5 +1,5 @@
 /* Malloc implementation for multiple threads without lock contention.
-   Copyright (C) 1996-2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1996-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Wolfram Gloger <wg@malloc.de>
    and Doug Lea <dl@cs.oswego.edu>, 2001.
@@ -4850,8 +4850,7 @@ _int_free(mstate av, mchunkptr p)
       free_perturb (chunk2mem(p), size - SIZE_SZ);
 
     set_fastchunks(av);
-    unsigned int idx = fastbin_index(size);
-    fb = &fastbin (av, idx);
+    fb = &fastbin (av, fastbin_index(size));
 
 #ifdef ATOMIC_FASTBINS
     mchunkptr fd;
@@ -4865,12 +4864,6 @@ _int_free(mstate av, mchunkptr p)
 	    errstr = "double free or corruption (fasttop)";
 	    goto errout;
 	  }
-	if (old != NULL && (chunksize(old) > request2size(MAX_FAST_SIZE)
-			    || fastbin_index(chunksize(old)) != idx))
-	  {
-	    errstr = "invalid fastbin entry (free)";
-	    goto errout;
-	  }
 	p->fd = fd = old;
       }
     while ((old = catomic_compare_and_exchange_val_rel (fb, p, fd)) != fd);
@@ -4882,12 +4875,6 @@ _int_free(mstate av, mchunkptr p)
 	errstr = "double free or corruption (fasttop)";
 	goto errout;
       }
-    if (*fb != NULL && (chunksize(*fb) > request2size(MAX_FAST_SIZE)
-			|| fastbin_index(chunksize(*fb)) != idx))
-      {
-	errstr = "invalid fastbin entry (free)";
-	goto errout;
-      }
 
     p->fd = *fb;
     *fb = p;

-----------------------------------------------------------------------

Summary of changes:
 malloc/malloc.c |   17 ++---------------
 1 files changed, 2 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]