Commit 2ee318a7bc5f7e975e31ca03d0e275fa3619633e
2011-07-05T15:09:17
Small fixes in pack_window_open Check if the window structure has actually been allocated before trying to access it, and don't leak said structure if the map fails. Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
diff --git a/src/odb_pack.c b/src/odb_pack.c
index 59661a6..44604ef 100644
--- a/src/odb_pack.c
+++ b/src/odb_pack.c
@@ -480,6 +480,9 @@ static unsigned char *pack_window_open(
size_t len;
win = git__calloc(1, sizeof(*win));
+ if (win == NULL)
+ return NULL;
+
win->offset = (offset / window_align) * window_align;
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) {}
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;
+ }
backend->mmap_calls++;
backend->open_windows++;