diff options
author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-03 16:57:35 +0000 |
---|---|---|
committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-03 16:57:35 +0000 |
commit | d27c458125a3412ca561ec38f6415588c9a9cdaa (patch) | |
tree | ba1b5449db44a3b9e545a2ad13d9ac2bbe5c3822 /astobj2.c | |
parent | 18edad800c797bc030a8d53e86b925d85f5e49b4 (diff) |
Merge code associated with AST-2009-006
(closes issue #12912)
Reported by: rathaus
Tested by: tilghman, russell, dvossel, dbrooks
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@215958 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'astobj2.c')
-rw-r--r-- | astobj2.c | 19 |
1 files changed, 16 insertions, 3 deletions
@@ -413,7 +413,7 @@ void *ao2_callback(struct ao2_container *c, const enum search_flags flags, ao2_callback_fn cb_fn, void *arg) { - int i, last; /* search boundaries */ + int i, start, last; /* search boundaries */ void *ret = NULL; if (INTERNAL_OBJ(c) == NULL) /* safety check on the argument */ @@ -443,13 +443,15 @@ void *ao2_callback(struct ao2_container *c, * (this only for the time being. We need to optimize this.) */ if ((flags & OBJ_POINTER)) /* we know hash can handle this case */ - i = c->hash_fn(arg, flags & OBJ_POINTER) % c->n_buckets; + start = i = c->hash_fn(arg, flags & OBJ_POINTER) % c->n_buckets; else /* don't know, let's scan all buckets */ i = -1; /* XXX this must be fixed later. */ /* determine the search boundaries: i..last-1 */ if (i < 0) { - i = 0; + start = i = 0; + last = c->n_buckets; + } else if ((flags & OBJ_CONTINUE)) { last = c->n_buckets; } else { last = i + 1; @@ -505,6 +507,17 @@ void *ao2_callback(struct ao2_container *c, } } AST_LIST_TRAVERSE_SAFE_END + + if (ret) { + /* This assumes OBJ_MULTIPLE with !OBJ_NODATA is still not implemented */ + break; + } + + if (i == c->n_buckets - 1 && (flags & OBJ_POINTER) && (flags & OBJ_CONTINUE)) { + /* Move to the beginning to ensure we check every bucket */ + i = -1; + last = start; + } } ao2_unlock(c); return ret; |