summaryrefslogtreecommitdiff
path: root/tables
diff options
context:
space:
mode:
authortrawick <trawick@13f79535-47bb-0310-9956-ffa450edef68>2002-11-23 04:29:55 +0000
committertrawick <trawick@13f79535-47bb-0310-9956-ffa450edef68>2002-11-23 04:29:55 +0000
commitc5ca4f13566d044eb945146f311feaf58a5dc048 (patch)
tree2ab76fdb6f4b4287ea1e5f97cfe6507dd79c381a /tables
parentd2f41c99954827cd84e4fea49b44176ea48e4fa3 (diff)
downloadlibapr-c5ca4f13566d044eb945146f311feaf58a5dc048.tar.gz
Fix a bug in apr_hash_merge() which caused the last entry in the
overlay has to be lost. PR: 10522 git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64061 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'tables')
-rw-r--r--tables/apr_hash.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tables/apr_hash.c b/tables/apr_hash.c
index dc99943fe..4a0fc5dbe 100644
--- a/tables/apr_hash.c
+++ b/tables/apr_hash.c
@@ -442,7 +442,7 @@ APR_DECLARE(apr_hash_t *) apr_hash_merge(apr_pool_t *p,
}
}
- for (k = 0; k < overlay->max; k++) {
+ for (k = 0; k <= overlay->max; k++) {
for (iter = overlay->array[k]; iter; iter = iter->next) {
i = iter->hash & res->max;
for (ent = res->array[i]; ent; ent = ent->next) {