From 015f2c98e26447cfe77553f08cc7d99d36bec2a5 Mon Sep 17 00:00:00 2001 From: Szymon Janc Date: Wed, 7 Jan 2015 17:26:03 +0100 Subject: [PATCH] shared/queue: Fix NULL data handling in queue_remove_all queue_remove_if returns data so we must check entries count to detect if entry was removed (with NULL data) or not found. --- src/shared/queue.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/shared/queue.c b/src/shared/queue.c index d94b34d5a..3507ed16c 100644 --- a/src/shared/queue.c +++ b/src/shared/queue.c @@ -362,9 +362,10 @@ unsigned int queue_remove_all(struct queue *queue, queue_match_func_t function, if (function) { while (entry) { void *data; + unsigned int entries = queue->entries; data = queue_remove_if(queue, function, user_data); - if (!data) + if (entries == queue->entries) break; if (destroy) -- 2.47.3