diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-03 18:42:41 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-03 18:42:41 +0000 |
| commit | f8f86993ac844ccaa9e28367ce3c5d74a4d77cee (patch) | |
| tree | 093994b2ca0bbcc6c57ba895c37374a999a6ce9a /main/astobj2.c | |
| parent | b15e6188d96ecb23acbd80882143361b658fffe5 (diff) | |
Merged revisions 215955 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r215955 | dvossel | 2009-09-03 11:31:54 -0500 (Thu, 03 Sep 2009) | 6 lines
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.6.2@216007 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/astobj2.c')
| -rw-r--r-- | main/astobj2.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/main/astobj2.c b/main/astobj2.c index 89790b08c..521810739 100644 --- a/main/astobj2.c +++ b/main/astobj2.c @@ -604,7 +604,7 @@ static void *__ao2_callback(struct ao2_container *c, const enum search_flags flags, void *cb_fn, void *arg, void *data, enum ao2_callback_type type, char *tag, char *file, int line, const char *funcname) { - int i, last; /* search boundaries */ + int i, start, last; /* search boundaries */ void *ret = NULL; ao2_callback_fn *cb_default = NULL; ao2_callback_data_fn *cb_withdata = NULL; @@ -641,13 +641,15 @@ static 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; @@ -715,6 +717,17 @@ static 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; |