wash/mango
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sandbox: queue: check list is not empty before popping entries

Browse Source
This commit is contained in:
max 🍓
2023-02-02 16:45:13 +00:00
parent 9409ebbb19
commit 49e23849a5
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sandbox/queue/include/socks/queue.h
View File

@@ -5,7 +5,8 @@
#define QUEUE_CONTAINER(t, m, v) ((void *)((v) ? (uintptr_t)(v) - (offsetof(t, m)) : 0)) #define QUEUE_CONTAINER(t, m, v) ((void *)((v) ? (uintptr_t)(v) - (offsetof(t, m)) : 0))
#define QUEUE_INIT ((queue_t){ .q_first = NULL, .q_last = NULL, .q_length = 0}) #define QUEUE_INIT ((queue_t){ .q_first = NULL, .q_last = NULL, .q_length = 0 })
#define QUEUE_ENTRY_INIT ((queue_entry_t){ .qe_next = NULL, .qe_prev = NULL })
#define queue_foreach(iter_type, iter_name, queue_name, node_member) \ #define queue_foreach(iter_type, iter_name, queue_name, node_member) \
for (iter_type *iter_name = QUEUE_CONTAINER(iter_type, node_member, queue_first(queue_name)); \ for (iter_type *iter_name = QUEUE_CONTAINER(iter_type, node_member, queue_first(queue_name)); \

17
sandbox/queue/queue.c
View File

@@ -1,4 +1,6 @@
#include <socks/queue.h> #include <socks/queue.h>
#include <assert.h>
#include <stdio.h>
void queue_insert_before(queue_t *q, queue_entry_t *entry, queue_entry_t *before) void queue_insert_before(queue_t *q, queue_entry_t *entry, queue_entry_t *before)
{ {
@@ -70,19 +72,30 @@ void queue_push_back(queue_t *q, queue_entry_t *entry)
queue_entry_t *queue_pop_front(queue_t *q) queue_entry_t *queue_pop_front(queue_t *q)
{ {
queue_entry_t *x = q->q_first; queue_entry_t *x = q->q_first;
queue_delete(q, x); if (x) {
queue_delete(q, x);
}
return x; return x;
} }
queue_entry_t *queue_pop_back(queue_t *q) queue_entry_t *queue_pop_back(queue_t *q)
{ {
queue_entry_t *x = q->q_last; queue_entry_t *x = q->q_last;
queue_delete(q, x); if (x) {
queue_delete(q, x);
}
return x; return x;
} }
void queue_delete(queue_t *q, queue_entry_t *entry) void queue_delete(queue_t *q, queue_entry_t *entry)
{ {
if (!entry) {
printf("null entry\n");
return;
}
if (entry == q->q_first) { if (entry == q->q_first) {
q->q_first = q->q_first->qe_next; q->q_first = q->q_first->qe_next;
} }