proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-06 10:32:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3976 from pks-t/pks/pqueue-null-deref

Browse Source 
pqueue: resolve possible NULL pointer dereference
This commit is contained in:
Patrick Steinhardt 2016-11-02 09:23:53 +01:00 committed by GitHub
commit 19001ca7ba
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pqueue.c
View File

@ -86,8 +86,9 @@ int git_pqueue_insert(git_pqueue *pq, void *item)
if ((pq->flags & GIT_PQUEUE_FIXED_SIZE) != 0 && if ((pq->flags & GIT_PQUEUE_FIXED_SIZE) != 0 &&
pq->length >= pq->_alloc_size) pq->length >= pq->_alloc_size)
{ {
/* skip this item if below min item in heap */ /* skip this item if below min item in heap or if
if (pq->_cmp(item, git_vector_get(pq, 0)) <= 0) * we do not have a comparison function */
if (!pq->_cmp || pq->_cmp(item, git_vector_get(pq, 0)) <= 0)
return 0; return 0;
/* otherwise remove the min item before inserting new */ /* otherwise remove the min item before inserting new */
(void)git_pqueue_pop(pq); (void)git_pqueue_pop(pq);

22
tests/core/pqueue.c
View File

@ -93,7 +93,29 @@ void test_core_pqueue__max_heap_size(void)
cl_assert_equal_i(0, git_pqueue_size(&pq)); cl_assert_equal_i(0, git_pqueue_size(&pq));
git_pqueue_free(&pq); git_pqueue_free(&pq);
}
void test_core_pqueue__max_heap_size_without_comparison(void)
{
git_pqueue pq;
int i, vals[100] = { 0 };
cl_git_pass(git_pqueue_init(&pq, GIT_PQUEUE_FIXED_SIZE, 50, NULL));
for (i = 0; i < 100; ++i)
cl_git_pass(git_pqueue_insert(&pq, &vals[i]));
cl_assert_equal_i(50, git_pqueue_size(&pq));
/* As we have no comparison function, we cannot make any
* actual assumptions about which entries are part of the
* pqueue */
for (i = 0; i < 50; ++i)
cl_assert(git_pqueue_pop(&pq));
cl_assert_equal_i(0, git_pqueue_size(&pq));
git_pqueue_free(&pq);
} }
static int cmp_ints_like_commit_time(const void *a, const void *b) static int cmp_ints_like_commit_time(const void *a, const void *b)