Fix of rbtree lookup on hash collisions.
Previous code incorrectly assumed that nodes with identical keys are linked
together. This might not be true after tree rebalance.
Patch by Lanshun Zhou.
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
index 5c51617..2e30471 100644
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -1689,20 +1689,15 @@
/* hash == node->key */
- do {
- rn = (ngx_resolver_node_t *) node;
+ rn = (ngx_resolver_node_t *) node;
- rc = ngx_memn2cmp(name->data, rn->name, name->len, rn->nlen);
+ rc = ngx_memn2cmp(name->data, rn->name, name->len, rn->nlen);
- if (rc == 0) {
- return rn;
- }
+ if (rc == 0) {
+ return rn;
+ }
- node = (rc < 0) ? node->left : node->right;
-
- } while (node != sentinel && hash == node->key);
-
- break;
+ node = (rc < 0) ? node->left : node->right;
}
/* not found */
