kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Patrick Steinhardt 2024-10-02 12:56:22 +02:00 committed by Junio C Hamano
parent 2d5dbb37b2
commit d0501c8c9d
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
reftable/merged.c
View File

@ -54,7 +54,10 @@ static int merged_iter_advance_subiter(struct merged_iter *mi, size_t idx)
if (err) if (err)
return err; return err;


merged_iter_pqueue_add(&mi->pq, &e); err = merged_iter_pqueue_add(&mi->pq, &e);
if (err)
return err;

return 0; return 0;
} }



7
reftable/pq.c
View File

@ -8,6 +8,7 @@ https://developers.google.com/open-source/licenses/bsd


#include "pq.h" #include "pq.h"


#include "reftable-error.h"
#include "reftable-record.h" #include "reftable-record.h"
#include "system.h" #include "system.h"
#include "basics.h" #include "basics.h"
@ -44,11 +45,13 @@ struct pq_entry merged_iter_pqueue_remove(struct merged_iter_pqueue *pq)
return e; 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; size_t i = 0;


REFTABLE_ALLOC_GROW(pq->heap, pq->len + 1, pq->cap); REFTABLE_ALLOC_GROW(pq->heap, pq->len + 1, pq->cap);
if (!pq->heap)
return REFTABLE_OUT_OF_MEMORY_ERROR;
pq->heap[pq->len++] = *e; pq->heap[pq->len++] = *e;


i = pq->len - 1; 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]); SWAP(pq->heap[j], pq->heap[i]);
i = j; i = j;
} }

return 0;
} }


void merged_iter_pqueue_release(struct merged_iter_pqueue *pq) void merged_iter_pqueue_release(struct merged_iter_pqueue *pq)

2
reftable/pq.h
View File

@ -23,7 +23,7 @@ struct merged_iter_pqueue {
}; };


struct pq_entry merged_iter_pqueue_remove(struct merged_iter_pqueue *pq); 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); void merged_iter_pqueue_release(struct merged_iter_pqueue *pq);
int pq_less(struct pq_entry *a, struct pq_entry *b); int pq_less(struct pq_entry *a, struct pq_entry *b);