Commit 79aa0302 by Jiri Pospisil

blame: Fix compare function's data types

Previously the hunk_byfinalline_search_cmp function was called with different
data types (size_t and uint32_t) for the key argument but expected only the
former resulting in an invalid memory access when passed the latter on a 64 bit
machine.

The following patch makes sure that the function is called and works with the
same type (size_t).
parent 00258cc0
...@@ -20,12 +20,15 @@ ...@@ -20,12 +20,15 @@
static int hunk_byfinalline_search_cmp(const void *key, const void *entry) static int hunk_byfinalline_search_cmp(const void *key, const void *entry)
{ {
uint16_t lineno = (uint16_t)*(size_t*)key;
git_blame_hunk *hunk = (git_blame_hunk*)entry; git_blame_hunk *hunk = (git_blame_hunk*)entry;
if (lineno < hunk->final_start_line_number) size_t lineno = *(size_t*)key;
size_t lines_in_hunk = (size_t)hunk->lines_in_hunk;
size_t final_start_line_number = (size_t)hunk->final_start_line_number;
if (lineno < final_start_line_number)
return -1; return -1;
if (lineno >= hunk->final_start_line_number + hunk->lines_in_hunk) if (lineno >= final_start_line_number + lines_in_hunk)
return 1; return 1;
return 0; return 0;
} }
...@@ -95,7 +98,7 @@ static void shift_hunks_by(git_vector *v, size_t start_line, int shift_by) ...@@ -95,7 +98,7 @@ static void shift_hunks_by(git_vector *v, size_t start_line, int shift_by)
{ {
size_t i; size_t i;
if (!git_vector_bsearch2( &i, v, hunk_byfinalline_search_cmp, &start_line)) { if (!git_vector_bsearch2(&i, v, hunk_byfinalline_search_cmp, &start_line)) {
for (; i < v->length; i++) { for (; i < v->length; i++) {
git_blame_hunk *hunk = (git_blame_hunk*)v->contents[i]; git_blame_hunk *hunk = (git_blame_hunk*)v->contents[i];
hunk->final_start_line_number += shift_by; hunk->final_start_line_number += shift_by;
...@@ -161,10 +164,10 @@ const git_blame_hunk *git_blame_get_hunk_byindex(git_blame *blame, uint32_t inde ...@@ -161,10 +164,10 @@ const git_blame_hunk *git_blame_get_hunk_byindex(git_blame *blame, uint32_t inde
const git_blame_hunk *git_blame_get_hunk_byline(git_blame *blame, uint32_t lineno) const git_blame_hunk *git_blame_get_hunk_byline(git_blame *blame, uint32_t lineno)
{ {
size_t i; size_t i, new_lineno = (size_t)lineno;
assert(blame); assert(blame);
if (!git_vector_bsearch2( &i, &blame->hunks, hunk_byfinalline_search_cmp, &lineno)) { if (!git_vector_bsearch2(&i, &blame->hunks, hunk_byfinalline_search_cmp, &new_lineno)) {
return git_blame_get_hunk_byindex(blame, (uint32_t)i); return git_blame_get_hunk_byindex(blame, (uint32_t)i);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment