[PATCH] hashmap: Fix removing last entry in l_hashmap_foreach_remove

[PATCH] hashmap: Fix removing last entry in l_hashmap_foreach_remove

[Andrew Zaborowski]

[-- Attachment #1: Type: text/plain, Size: 626 bytes --]

When the last entry in a bucket with 2 or more entries was removed
the loop would roll over and iterate over the remaining entries for a
second time (then stop), add missing check.
---
 ell/hashmap.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ell/hashmap.c b/ell/hashmap.c
index ee11d31..061080b 100644
--- a/ell/hashmap.c
+++ b/ell/hashmap.c
@@ -607,6 +607,8 @@ LIB_EXPORT unsigned int l_hashmap_foreach_remove(struct l_hashmap *hashmap,
 				free_key(hashmap, entry->key);
 				l_free(entry);
 				entry = prev->next;
+				if (entry == head)
+					break;
 				continue;
 			}
 
-- 
2.19.1

Re: [PATCH] hashmap: Fix removing last entry in l_hashmap_foreach_remove

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 388 bytes --]

Hi Andrew,

On 10/19/2018 09:33 PM, Andrew Zaborowski wrote:
> When the last entry in a bucket with 2 or more entries was removed
> the loop would roll over and iterate over the remaining entries for a
> second time (then stop), add missing check.
> ---
>   ell/hashmap.c | 2 ++
>   1 file changed, 2 insertions(+)
> 

Hah, good catch.  Applied, thanks.

Regards,
-Denis