summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES2
-rw-r--r--tables/apr_tables.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 9ea978cbc..2300ce104 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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
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;