reftable/pq: handle allocation failures when adding entries

Handle allocation failures when adding entries to the pqueue. Adapt its
only caller accordingly.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/reftable/merged.c b/reftable/merged.c
index 69790c345cd10bb56a5a191d24f24c8d1b45dbad..8e202a8efd6418d21843c6bcb518f473a6a70061 100644 (file)
--- a/reftable/merged.c
+++ b/reftable/merged.c
@@ -54,7 +54,10 @@ static int merged_iter_advance_subiter(struct merged_iter *mi, size_t idx)
        if (err)
                return err;
 
-       merged_iter_pqueue_add(&mi->pq, &e);
+       err = merged_iter_pqueue_add(&mi->pq, &e);
+       if (err)
+               return err;
+
        return 0;
 }
 

diff --git a/reftable/pq.c b/reftable/pq.c
index 2b5b7d1c0e28666becae6fea86e72788b99e7997..03b99122829f3b7eb7502b288c144050cb1f78f9 100644 (file)
--- a/reftable/pq.c
+++ b/reftable/pq.c
@@ -8,6 +8,7 @@ https://developers.google.com/open-source/licenses/bsd
 
 #include "pq.h"
 
+#include "reftable-error.h"
 #include "reftable-record.h"
 #include "system.h"
 #include "basics.h"
@@ -44,11 +45,13 @@ struct pq_entry merged_iter_pqueue_remove(struct merged_iter_pqueue *pq)
        return e;
 }
 
-void merged_iter_pqueue_add(struct merged_iter_pqueue *pq, const struct pq_entry *e)
+int merged_iter_pqueue_add(struct merged_iter_pqueue *pq, const struct pq_entry *e)
 {
        size_t i = 0;
 
        REFTABLE_ALLOC_GROW(pq->heap, pq->len + 1, pq->cap);
+       if (!pq->heap)
+               return REFTABLE_OUT_OF_MEMORY_ERROR;
        pq->heap[pq->len++] = *e;
 
        i = pq->len - 1;
@@ -59,6 +62,8 @@ void merged_iter_pqueue_add(struct merged_iter_pqueue *pq, const struct pq_entry
                SWAP(pq->heap[j], pq->heap[i]);
                i = j;
        }
+
+       return 0;
 }
 
 void merged_iter_pqueue_release(struct merged_iter_pqueue *pq)

diff --git a/reftable/pq.h b/reftable/pq.h
index 707bd26767bd117dc1aa49a7529adefe95da5b37..83c062eecac9f2ffe46d8fd7485775f2a84b3a54 100644 (file)
--- a/reftable/pq.h
+++ b/reftable/pq.h
@@ -23,7 +23,7 @@ struct merged_iter_pqueue {
 };
 
 struct pq_entry merged_iter_pqueue_remove(struct merged_iter_pqueue *pq);
-void merged_iter_pqueue_add(struct merged_iter_pqueue *pq, const struct pq_entry *e);
+int merged_iter_pqueue_add(struct merged_iter_pqueue *pq, const struct pq_entry *e);
 void merged_iter_pqueue_release(struct merged_iter_pqueue *pq);
 int pq_less(struct pq_entry *a, struct pq_entry *b);