patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

misc: rb: Fix possible infinity loop

Browse source 
The macro RB_FOR_EACH_CONTAINER could run infinitely when the function
_rb_foreach_next returns NULL.

Signed-off-by: Flavio Ceolin <flavio.ceolin@intel.com>
This commit is contained in:
Flavio Ceolin 2019-02-22 22:32:13 -03:00 committed by Anas Nashif
parent abc394bd4d
commit 942d4bba94
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/misc/rb.h
View file

@ -178,10 +178,11 @@ struct rbnode *_rb_foreach_next(struct rbtree *tree, struct _rb_foreach *f);
* @param node The symbol name of a local iterator
* @param field The field name of a struct rbnode inside node
*/
#define RB_FOR_EACH_CONTAINER(tree, node, field) \
for (struct _rb_foreach __f = _RB_FOREACH_INIT(tree, node); \
(node = CONTAINER_OF(_rb_foreach_next(tree, &__f), \
__typeof__(*(node)), field)) != NULL; \
/**/)
#define RB_FOR_EACH_CONTAINER(tree, node, field) \
for (struct _rb_foreach __f = _RB_FOREACH_INIT(tree, node); \
({struct rbnode *n = _rb_foreach_next(tree, &__f); \
node = n ? CONTAINER_OF(n, __typeof__(*(node)), \
field) : NULL; }) != NULL; \
/**/)
#endif /* ZEPHYR_INCLUDE_MISC_RB_H_ */