zzy/openssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug in priority queue remove function

Browse Source 
The short circuit in the remove function when the element is the last in the
heap, failed to add the removed slot back to the freelist.

Fixes #22644

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22646)
This commit is contained in:
Pauli 2023-11-07 07:32:18 +11:00 committed by Hugo Landau
parent ec0d22fe15
commit a031087780
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ssl/priority_queue.c
View File

@ -265,8 +265,14 @@ void *ossl_pqueue_remove(OSSL_PQUEUE *pq, size_t elem)
ASSERT_USED(pq, n);
if (n == pq->htop - 1)
if (n == pq->htop - 1) {
pq->elements[elem].posn = pq->freelist;
pq->freelist = elem;
#ifndef NDEBUG
pq->elements[elem].used = 0;
#endif
return pq->heap[--pq->htop].data;
}
if (n > 0)
pqueue_force_bottom(pq, n);
return ossl_pqueue_pop(pq);