proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-07-01 11:53:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mwindow: make sure the whole range is contained inside the same window

Browse Source 
Looking through the open windows to check whether we can re-use an
open window should take into account whether both `offset` and `offset
+ extra` are contained within the same window. Failure to do so can
lead to invalid memory accesses. This closes #614.

While we're in the area remove an outdated assert.
This commit is contained in:
Carlos Martín Nieto 2012-04-04 16:21:52 +02:00
parent bbb3723657
commit 31e80290a1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mwindow.c
View File

@ -211,13 +211,15 @@ unsigned char *git_mwindow_open(
git_mwindow_ctl *ctl = &GIT_GLOBAL->mem_ctl; git_mwindow_ctl *ctl = &GIT_GLOBAL->mem_ctl;
git_mwindow *w = *cursor; git_mwindow *w = *cursor;
if (!w || !git_mwindow_contains(w, offset + extra)) { if (!w || !(git_mwindow_contains(w, offset) &&
git_mwindow_contains(w, offset + extra))) {
if (w) { if (w) {
w->inuse_cnt--; w->inuse_cnt--;
} }
for (w = mwf->windows; w; w = w->next) { for (w = mwf->windows; w; w = w->next) {
if (git_mwindow_contains(w, offset + extra)) if (git_mwindow_contains(w, offset) &&
git_mwindow_contains(w, offset + extra))
break; break;
} }
@ -242,7 +244,6 @@ unsigned char *git_mwindow_open(
} }
offset -= w->offset; offset -= w->offset;
assert(git__is_sizet(offset));
if (left) if (left)
*left = (unsigned int)(w->window_map.len - offset); *left = (unsigned int)(w->window_map.len - offset);