From cd86deefa141b719cde080146ed6027fa0786a52 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 16 Oct 2018 22:27:30 +0900 Subject: [PATCH] util: fix segfault in prioq_remove() with empty Prioq object --- src/basic/prioq.c | 3 +++ src/test/test-prioq.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/basic/prioq.c b/src/basic/prioq.c index ef28a08..e816b2c 100644 --- a/src/basic/prioq.c +++ b/src/basic/prioq.c @@ -211,6 +211,9 @@ _pure_ static struct prioq_item* find_item(Prioq *q, void *data, unsigned *idx) assert(q); + if (q->n_items <= 0) + return NULL; + if (idx) { if (*idx == PRIOQ_IDX_NULL || *idx > q->n_items) diff --git a/src/test/test-prioq.c b/src/test/test-prioq.c index 8aff669..b2ee70b 100644 --- a/src/test/test-prioq.c +++ b/src/test/test-prioq.c @@ -86,6 +86,7 @@ static void test_struct(void) { while ((t = set_steal_first(s))) { assert_se(prioq_remove(q, t, &t->idx) == 1); assert_se(prioq_remove(q, t, &t->idx) == 0); + assert_se(prioq_remove(q, t, NULL) == 0); free(t); } @@ -94,6 +95,8 @@ static void test_struct(void) { assert_se(prioq_size(q) == (SET_SIZE * 3 / 4) - i); assert_se(t = prioq_pop(q)); + assert_se(prioq_remove(q, t, &t->idx) == 0); + assert_se(prioq_remove(q, t, NULL) == 0); assert_se(previous <= t->value); previous = t->value; -- 2.7.4