diff options
| author | Joshua Colp <jcolp@digium.com> | 2015-05-26 16:07:13 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2015-05-26 16:07:13 -0500 |
| commit | 87c03b792b0b87447cb820fcbfab6a859996ddd6 (patch) | |
| tree | 8f0312681fa0226cde12334bbd464482e57abf40 | |
| parent | 5a42397018f8b850b3901de0a09b8befad602b37 (diff) | |
| parent | 97a6ce1717bd0c4b1b4305f10f13fd5ec9bb7441 (diff) | |
Merge "Astobj2: Correctly treat hash_fn returning INT_MIN" into 13
| -rw-r--r-- | main/astobj2_hash.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/main/astobj2_hash.c b/main/astobj2_hash.c index 066999f49..1cd6ee249 100644 --- a/main/astobj2_hash.c +++ b/main/astobj2_hash.c @@ -235,8 +235,7 @@ static struct hash_bucket_node *hash_ao2_new_node(struct ao2_container_hash *sel return NULL; } - i = abs(self->hash_fn(obj_new, OBJ_SEARCH_OBJECT)); - i %= self->n_buckets; + i = abs(self->hash_fn(obj_new, OBJ_SEARCH_OBJECT) % self->n_buckets); if (tag) { __ao2_ref_debug(obj_new, +1, tag, file, line, func); @@ -386,8 +385,8 @@ static struct hash_bucket_node *hash_ao2_find_first(struct ao2_container_hash *s case OBJ_SEARCH_OBJECT: case OBJ_SEARCH_KEY: /* we know hash can handle this case */ - bucket_cur = abs(self->hash_fn(arg, flags & OBJ_SEARCH_MASK)); - bucket_cur %= self->n_buckets; + bucket_cur = abs(self->hash_fn(arg, flags & OBJ_SEARCH_MASK) + % self->n_buckets); state->sort_fn = self->common.sort_fn; break; case OBJ_SEARCH_PARTIAL_KEY: @@ -984,8 +983,8 @@ static int hash_ao2_integrity(struct ao2_container_hash *self) ++count_obj; /* Check container hash key for expected bucket. */ - bucket_exp = abs(self->hash_fn(node->common.obj, OBJ_SEARCH_OBJECT)); - bucket_exp %= self->n_buckets; + bucket_exp = abs(self->hash_fn(node->common.obj, OBJ_SEARCH_OBJECT) + % self->n_buckets); if (bucket != bucket_exp) { ast_log(LOG_ERROR, "Bucket %d node hashes to bucket %d!\n", bucket, bucket_exp); |