summaryrefslogtreecommitdiff
path: root/tables
diff options
context:
space:
mode:
authorianh <ianh@13f79535-47bb-0310-9956-ffa450edef68>2001-12-09 00:52:19 +0000
committerianh <ianh@13f79535-47bb-0310-9956-ffa450edef68>2001-12-09 00:52:19 +0000
commitf56756ad1a90cf44c7611b402671dbb57039a215 (patch)
tree52a98f799c3fcd8c78a58d871b831a7181fe62d0 /tables
parent2517e4430ac8d776c64a0f10dab6547a7b018ab2 (diff)
downloadlibapr-f56756ad1a90cf44c7611b402671dbb57039a215.tar.gz
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 git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@62612 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'tables')
-rw-r--r--tables/apr_tables.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/tables/apr_tables.c b/tables/apr_tables.c
index 7827b9964..c8095a723 100644
--- a/tables/apr_tables.c
+++ b/tables/apr_tables.c
@@ -844,6 +844,7 @@ static void overlap_hash(overlap_key *elt,
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;