summaryrefslogtreecommitdiff
path: root/src/pqueue.c
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2016-10-28 16:07:40 +0200
committerPatrick Steinhardt <ps@pks.im>2016-10-28 16:19:24 +0200
commit95fa38802f12b930b3acf3fe842408bb33eb1d18 (patch)
treea278fd7f1e25cc5d9a78161d2738cb70aebb57c9 /src/pqueue.c
parente3298a330835af8d4760bf593500c28728398747 (diff)
downloadlibgit2-95fa38802f12b930b3acf3fe842408bb33eb1d18.tar.gz
pqueue: resolve possible NULL pointer dereference
The `git_pqueue` struct allows being fixed in its total number of entries. In this case, we simply throw away items that are inserted into the priority queue by examining wether the new item to be inserted has a higher priority than the previous smallest one. This feature somewhat contradicts our pqueue implementation in that it is allowed to not have a comparison function. In fact, we also fail to check if the comparison function is actually set in the case where we add a new item into a fully filled fixed-size pqueue. As we cannot determine which item is the smallest item in absence of a comparison function, we fix the `NULL` pointer dereference by simply dropping all new items which are about to be inserted into a full fixed-size pqueue.
Diffstat (limited to 'src/pqueue.c')
-rw-r--r--src/pqueue.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/pqueue.c b/src/pqueue.c
index 8cfc4390f..9341d1af3 100644
--- a/src/pqueue.c
+++ b/src/pqueue.c
@@ -86,8 +86,9 @@ int git_pqueue_insert(git_pqueue *pq, void *item)
if ((pq->flags & GIT_PQUEUE_FIXED_SIZE) != 0 &&
pq->length >= pq->_alloc_size)
{
- /* skip this item if below min item in heap */
- if (pq->_cmp(item, git_vector_get(pq, 0)) <= 0)
+ /* skip this item if below min item in heap or if
+ * we do not have a comparison function */
+ if (!pq->_cmp || pq->_cmp(item, git_vector_get(pq, 0)) <= 0)
return 0;
/* otherwise remove the min item before inserting new */
(void)git_pqueue_pop(pq);