From 36d99a3d2a730afd06adadfeb6d5ebdc5a0136e9 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@fedoraproject.org>
Date: Nov 19 2004 06:46:12 +0000
Subject: auto-import glibc-2.3.3-81 on branch devel from glibc-2.3.3-81.src.rpm


---

diff --git a/glibc-fedora.patch b/glibc-fedora.patch
index fb26514..c74fb4d 100644
--- a/glibc-fedora.patch
+++ b/glibc-fedora.patch
@@ -1366,13 +1366,13 @@
  /* Compile-time constants.  */
  
 --- glibc-20041119T0003/malloc/malloc.c	13 Nov 2004 19:49:43 -0000	1.136
-+++ glibc-20041119T0003-fedora/malloc/malloc.c	19 Nov 2004 00:20:40 -0000	1.127.2.9
++++ glibc-20041119T0003-fedora/malloc/malloc.c	19 Nov 2004 06:38:37 -0000	1.127.2.10
 @@ -24,7 +24,7 @@
    Doug Lea and adapted to multiple threads/arenas by Wolfram Gloger.
  
  * Version ptmalloc2-20011215
 -  $Id: malloc.c,v 1.136 2004/11/13 19:49:43 drepper Exp $
-+  $Id: malloc.c,v 1.127.2.9 2004/11/19 00:20:40 jakub Exp $
++  $Id: malloc.c,v 1.127.2.10 2004/11/19 06:38:37 jakub Exp $
    based on:
    VERSION 2.7.0 Sun Mar 11 14:14:06 2001  Doug Lea  (dl at gee)
  
@@ -1380,7 +1380,7 @@
  #endif
        ) {
  
-+    if (__builtin_expect (chunksize (chunk_at_offset (p, size)) <= 2 * SIZE_SZ,
++    if (__builtin_expect (chunk_at_offset (p, size)->size <= 2 * SIZE_SZ,
 +			  0)
 +	|| __builtin_expect (chunksize (chunk_at_offset (p, size))
 +			     >= av->system_mem, 0))
@@ -1397,7 +1397,7 @@
  
      nextsize = chunksize(nextchunk);
 -    assert(nextsize > 0);
-+    if (__builtin_expect (nextsize <= 2 * SIZE_SZ, 0)
++    if (__builtin_expect (nextchunk->size <= 2 * SIZE_SZ, 0)
 +	|| __builtin_expect (nextsize >= av->system_mem, 0))
 +      {
 +	errstr = "invalid next size (normal)";
diff --git a/glibc.spec b/glibc.spec
index 47098be..7435880 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
 %define glibcdate 20041119T0003
 %define glibcversion 2.3.3
-%define glibcrelease 80
+%define glibcrelease 81
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 ppc ppc64
@@ -1258,6 +1258,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Fri Nov 19 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-81
+- don't use chunksize in <= 2 * SIZE_SZ free () checks
+
 * Fri Nov 19 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-80
 - update from CVS
   - with -D_FORTIFY_SOURCE=2, prevent missing %N$ formats