From cvs-return-2506-apmail-apr-cvs-archive=apr.apache.org@apr.apache.org Sun Dec 09 01:11:57 2001
Return-Path: <cvs-return-2506-apmail-apr-cvs-archive=apr.apache.org@apr.apache.org>
Delivered-To: apmail-apr-cvs-archive@apr.apache.org
Received: (qmail 3538 invoked by uid 500); 9 Dec 2001 01:11:57 -0000
Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:cvs@apr.apache.org>
List-Help: <mailto:cvs-help@apr.apache.org>
List-Unsubscribe: <mailto:cvs-unsubscribe@apr.apache.org>
List-Subscribe: <mailto:cvs-subscribe@apr.apache.org>
Reply-To: dev@apr.apache.org
Delivered-To: mailing list cvs@apr.apache.org
Received: (qmail 3526 invoked from network); 9 Dec 2001 01:11:57 -0000
Date: 9 Dec 2001 00:52:19 -0000
Message-ID: <20011209005219.85325.qmail@icarus.apache.org>
From: ianh@apache.org
To: apr-cvs@apache.org
Subject: cvs commit: apr/tables apr_tables.c
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

ianh        01/12/08 16:52:19

  Modified:    .        CHANGES
               tables   apr_tables.c
  Log:
  fix segv in apr_table_overlap
  
  This patch fixes a bug in apr_table_overlap: when using the
  APR_OVERLAP_TABLES_SET option, the red-black tree's shape
  properties were sometimes broken, which could cause a segfault
  if it happened at the root node of the tree.
  
  Obtained from: Brian Pane
  
  Revision  Changes    Path
  1.195     +2 -0      apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.194
  retrieving revision 1.195
  diff -u -r1.194 -r1.195
  --- CHANGES	2001/12/08 05:01:59	1.194
  +++ CHANGES	2001/12/09 00:52:19	1.195
  @@ -1,5 +1,7 @@
   Changes with APR b1  
   
  +  *) SEGV in apr_table_overlap [Brian Pane]
  +
     *) apr_array_copy speedup by removing the zero-fill [Brian Pane]
   
     *) Fix build breakage on systems with getaddrinfo() but not 
  
  
  
  1.21      +1 -0      apr/tables/apr_tables.c
  
  Index: apr_tables.c
  ===================================================================
  RCS file: /home/cvs/apr/tables/apr_tables.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- apr_tables.c	2001/12/08 05:01:59	1.20
  +++ apr_tables.c	2001/12/09 00:52:19	1.21
  @@ -844,6 +844,7 @@
                           next->tree_right->tree_parent = elt;
                       }
                       elt->tree_parent = next->tree_parent;
  +                    elt->color = next->color;
                       (*child) = elt;
                       elt->merge_next = NULL;
                       elt->merge_last = NULL;