korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-12-02 00:24:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

shared/queue: Fix queue_foreach not detecting queue has been destroyed

Browse Source 
This fixes queue_foreach crashing if it callback call queue_destroy.
This commit is contained in:
Luiz Augusto von Dentz 2014-05-22 12:15:52 +03:00
parent 661d845b71
commit e57233b4f9
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/shared/queue.c
View File

@ -34,11 +34,30 @@ struct queue_entry {
};
struct queue {
int ref_count;
struct queue_entry *head;
struct queue_entry *tail;
unsigned int entries;
};
static struct queue *queue_ref(struct queue *queue)
{
if (!queue)
return NULL;
__sync_fetch_and_add(&queue->ref_count, 1);
return queue;
}
static void queue_unref(struct queue *queue)
{
if (__sync_sub_and_fetch(&queue->ref_count, 1))
return;
free(queue);
}
struct queue *queue_new(void)
{
struct queue *queue;
@ -51,7 +70,7 @@ struct queue *queue_new(void)
queue->tail = NULL;
queue->entries = 0;
return queue;
return queue_ref(queue);
}
void queue_destroy(struct queue *queue, queue_destroy_func_t destroy)
@ -74,7 +93,7 @@ void queue_destroy(struct queue *queue, queue_destroy_func_t destroy)
free(tmp);
}
free(queue);
queue_unref(queue);
}
bool queue_push_tail(struct queue *queue, void *data)
@ -177,14 +196,18 @@ void queue_foreach(struct queue *queue, queue_foreach_func_t function,
return;
entry = queue->head;
if (!entry)
return;
while (entry) {
queue_ref(queue);
while (entry && queue->ref_count > 1) {
struct queue_entry *tmp = entry;
entry = tmp->next;
function(tmp->data, user_data);
}
queue_unref(queue);
}
void *queue_find(struct queue *queue, queue_match_func_t function,