diff options
author | Corey Farrell <git@cfware.com> | 2017-10-05 18:59:06 -0400 |
---|---|---|
committer | Corey Farrell <git@cfware.com> | 2017-10-06 13:39:04 -0500 |
commit | 8bf4be1048c7cd2638ec111c3bd2b2d7953e60c9 (patch) | |
tree | 85967383c615a152962bab40c44c7b21ea7b9091 /include | |
parent | 7703ab04438b8c8ea15738621a7434b40c44d219 (diff) |
vector: multiple evaluation of elem in AST_VECTOR_ADD_SORTED.
Use temporary variable to prevent multiple evaluations of elem argument.
This resolves a memory leak in res_pjproject startup.
ASTERISK-27317 #close
Change-Id: Ib960d7f5576f9e1a3c478ecb48995582a574e06d
Diffstat (limited to 'include')
-rw-r--r-- | include/asterisk/vector.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/asterisk/vector.h b/include/asterisk/vector.h index 2073baedf..945a7875f 100644 --- a/include/asterisk/vector.h +++ b/include/asterisk/vector.h @@ -304,27 +304,31 @@ AST_VECTOR(ast_vector_int, int); * \brief Add an element into a sorted vector * * \param vec Sorted vector to add to. - * \param elem Element to insert. + * \param elem Element to insert. Must not be an array type. * \param cmp A strcmp compatible compare function. * * \return 0 on success. * \return Non-zero on failure. * * \warning Use of this macro on an unsorted vector will produce unpredictable results + * \warning 'elem' must not be an array type so passing 'x' where 'x' is defined as + * 'char x[4]' will fail to compile. However casting 'x' as 'char *' does + * result in a value that CAN be used. */ #define AST_VECTOR_ADD_SORTED(vec, elem, cmp) ({ \ int res = 0; \ size_t __idx = (vec)->current; \ + typeof(elem) __elem = (elem); \ do { \ if (__make_room((vec)->current, vec) != 0) { \ res = -1; \ break; \ } \ - while (__idx > 0 && (cmp((vec)->elems[__idx - 1], elem) > 0)) { \ + while (__idx > 0 && (cmp((vec)->elems[__idx - 1], __elem) > 0)) { \ (vec)->elems[__idx] = (vec)->elems[__idx - 1]; \ __idx--; \ } \ - (vec)->elems[__idx] = elem; \ + (vec)->elems[__idx] = __elem; \ (vec)->current++; \ } while (0); \ res; \ |