proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-18 07:23:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2167 from mekishizufu/memory_access_fixes

Browse Source 
Fun with memory access
This commit is contained in:
Vicent Marti 2014-03-07 16:26:58 +01:00
commit 628edd6b1b
2 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/blame.c
View File

@ -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)
{ {
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
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);
} }

24
src/oid.c
View File

@ -24,30 +24,24 @@ int git_oid_fromstrn(git_oid *out, const char *str, size_t length)
size_t p; size_t p;
int v; int v;
assert(out && str);
if (!length)
return oid_error_invalid("too short");
if (length > GIT_OID_HEXSZ) if (length > GIT_OID_HEXSZ)
return oid_error_invalid("too long"); return oid_error_invalid("too long");
for (p = 0; p < length - 1; p += 2) { memset(out->id, 0, GIT_OID_RAWSZ);
v = (git__fromhex(str[p + 0]) << 4)
| git__fromhex(str[p + 1]);
for (p = 0; p < length; p++) {
v = git__fromhex(str[p]);
if (v < 0) if (v < 0)
return oid_error_invalid("contains invalid characters"); return oid_error_invalid("contains invalid characters");
out->id[p / 2] = (unsigned char)v; out->id[p / 2] |= (unsigned char)(v << (p % 2 ? 0 : 4));
} }
if (length % 2) {
v = (git__fromhex(str[p + 0]) << 4);
if (v < 0)
return oid_error_invalid("contains invalid characters");
out->id[p / 2] = (unsigned char)v;
p += 2;
}
memset(out->id + p / 2, 0, (GIT_OID_HEXSZ - p) / 2);
return 0; return 0;
} }