diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2016-10-11 16:51:30 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-10-11 16:51:30 -0500 |
| commit | 39dbe7aba4824cc0f2aa6ba223171558a227fef2 (patch) | |
| tree | 2c2c3d3a3ffceb737719b0442ced70dae6ce9818 | |
| parent | 64b43d447459dd3cdb19f8c568124fca259509d2 (diff) | |
| parent | a884b26392c2199efb8d443f88551e83418e3176 (diff) | |
Merge "vector: After remove element recheck index" into 13
| -rw-r--r-- | include/asterisk/vector.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/include/asterisk/vector.h b/include/asterisk/vector.h index ef6104d57..4306670e7 100644 --- a/include/asterisk/vector.h +++ b/include/asterisk/vector.h @@ -367,11 +367,13 @@ int count = 0; \ size_t idx; \ typeof(value) __value = (value); \ - for (idx = 0; idx < (vec)->current; ++idx) { \ + for (idx = 0; idx < (vec)->current; ) { \ if (cmp((vec)->elems[idx], __value)) { \ cleanup((vec)->elems[idx]); \ AST_VECTOR_REMOVE_UNORDERED((vec), idx); \ ++count; \ + } else { \ + ++idx; \ } \ } \ count; \ @@ -417,14 +419,16 @@ int count = 0; \ size_t idx; \ typeof(value) __value = (value); \ - for (idx = 0; idx < (vec)->current; ++idx) { \ + for (idx = 0; idx < (vec)->current; ) { \ if (cmp((vec)->elems[idx], __value)) { \ cleanup((vec)->elems[idx]); \ - AST_VECTOR_REMOVE_ORDERED((vec), idx); \ + AST_VECTOR_REMOVE_ORDERED((vec), idx); \ ++count; \ + } else { \ + ++idx; \ } \ } \ - oount; \ + count; \ }) /*! @@ -445,7 +449,7 @@ for (idx = 0; idx < (vec)->current; ++idx) { \ if (cmp((vec)->elems[idx], __value)) { \ cleanup((vec)->elems[idx]); \ - AST_VECTOR_REMOVE_ORDERED((vec), idx); \ + AST_VECTOR_REMOVE_ORDERED((vec), idx); \ res = 0; \ break; \ } \ |