X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fprioq.c;h=b7d745990c4bcf78236ba44d6ad2495766d7a15d;hp=fe91324d9b5790e9d93ebff317ef714eef4c9fd9;hb=e3017af97310da024ffb378ed155bc1676922ce7;hpb=43b4c9aaf56aefdc55c4b6c1df78e30cdcf3988f

diff --git a/src/shared/prioq.c b/src/shared/prioq.c
index fe91324d9..b7d745990 100644
--- a/src/shared/prioq.c
+++ b/src/shared/prioq.c
@@ -53,6 +53,19 @@ void prioq_free(Prioq *q) {
         free(q);
 }
 
+int prioq_ensure_allocated(Prioq **q, compare_func_t compare_func) {
+        assert(q);
+
+        if (*q)
+                return 0;
+
+        *q = prioq_new(compare_func);
+        if (!*q)
+                return -ENOMEM;
+
+        return 0;
+}
+
 static void swap(Prioq *q, unsigned j, unsigned k) {
         void *saved_data;
         unsigned *saved_idx;
@@ -204,9 +217,12 @@ static struct prioq_item* find_item(Prioq *q, void *data, unsigned *idx) {
         assert(q);
 
         if (idx) {
-                assert(*idx < q->n_items);
+                if (*idx > q->n_items)
+                        return NULL;
+
                 i = q->items + *idx;
-                assert(i->data == data);
+                if (i->data != data)
+                        return NULL;
 
                 return i;
         } else {