ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vppinfra: fix ASAN issue in vec_foreach_pointer and pool_foreach_pointer

Browse Source 
Change-Id: If9381ae7283488b352a3c22f85732cd56ac6bfd9
Type: fix
Fixes: 9937359, 91ff0e9
Signed-off-by: Damjan Marion <damarion@cisco.com>
This commit is contained in:
Damjan Marion
2023-11-06 17:37:04 +00:00
parent 4504df795b
commit e73c731ad8
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/vppinfra/pool.h
View File

@ -571,9 +571,10 @@ do { \
/* works only for pool of pointers, e is declared inside macro */
#define pool_foreach_pointer(e, p) \
if (p) \
for (typeof ((p)[0]) *_t = (p) + pool_get_first_index (p), (e) = *_t; \
_t < vec_end (p); \
_t = (p) + pool_get_next_index (p, _t - (p)), (e) = *_t)
for (typeof ((p)[0]) *_t = (p) + pool_get_first_index (p), (e) = *_t, \
*_end = vec_end (p); \
_t < _end; _t = (p) + pool_get_next_index (p, _t - (p)), \
(e) = _t < _end ? *_t : (e))
/**
* @brief Remove all elements from a pool in a safe way

4
src/vppinfra/vec_bootstrap.h
View File

@ -240,8 +240,8 @@ _vec_set_len (void *v, uword len, uword elt_sz)
#define vec_foreach_pointer(e, v) \
if (v) \
for (typeof (**v) **__ep = (v), *(e) = *__ep; __ep - (v) < vec_len (v); \
__ep++, (e) = *__ep)
for (typeof (**v) **__ep = (v), **__end = vec_end (v), *(e) = *__ep; \
__ep < __end; __ep++, (e) = __ep < __end ? *__ep : (e))
#endif /* included_clib_vec_bootstrap_h */