Merge pull request #302 from carlosmn/development

Small fixes in pack_window_open
This commit is contained in:
Vicent Martí 2011-07-05 06:35:45 -07:00
commit 2f3f28b462

View File

@ -480,6 +480,9 @@ static unsigned char *pack_window_open(
size_t len; size_t len;
win = git__calloc(1, sizeof(*win)); win = git__calloc(1, sizeof(*win));
if (win == NULL)
return NULL;
win->offset = (offset / window_align) * window_align; win->offset = (offset / window_align) * window_align;
len = (size_t)(p->pack_size - win->offset); len = (size_t)(p->pack_size - win->offset);
@ -492,8 +495,10 @@ static unsigned char *pack_window_open(
pack_window_close_lru(backend, p, p->pack_fd) == GIT_SUCCESS) {} pack_window_close_lru(backend, p, p->pack_fd) == GIT_SUCCESS) {}
if (git_futils_mmap_ro(&win->window_map, p->pack_fd, if (git_futils_mmap_ro(&win->window_map, p->pack_fd,
win->offset, len) < GIT_SUCCESS) win->offset, len) < GIT_SUCCESS) {
free(win);
return NULL; return NULL;
}
backend->mmap_calls++; backend->mmap_calls++;
backend->open_windows++; backend->open_windows++;