diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-24 15:31:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-24 15:31:21 -0700 |
| commit | b0de55541024a39ece47cf7a1eebdbde08ba978f (patch) | |
| tree | 5b652d49aaab85a7571aa41978f39dc80c1a6b48 | |
| parent | cbc8c6104199ffa63b61f4e8dee32d3a713e2939 (diff) | |
| parent | 2a5643da732b70004920f75efa1ebdc2a6ed1689 (diff) | |
| download | git-b0de55541024a39ece47cf7a1eebdbde08ba978f.tar.gz git-b0de55541024a39ece47cf7a1eebdbde08ba978f.tar.xz | |
Merge branch 'maint-1.6.1' into maint
* maint-1.6.1:
close_sha1_file(): make it easier to diagnose errors
avoid possible overflow in delta size filtering computation
| -rw-r--r-- | builtin-pack-objects.c | 2 | ||||
| -rw-r--r-- | sha1_file.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c index bcefa52c6..8ca46c8de 100644 --- a/builtin-pack-objects.c +++ b/builtin-pack-objects.c @@ -1293,7 +1293,7 @@ static int try_delta(struct unpacked *trg, struct unpacked *src, max_size = trg_entry->delta_size; ref_depth = trg->depth; } - max_size = max_size * (max_depth - src->depth) / + max_size = (uint64_t)max_size * (max_depth - src->depth) / (max_depth - ref_depth + 1); if (max_size == 0) return 0; diff --git a/sha1_file.c b/sha1_file.c index 032300c4c..a07aa4e5c 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -2301,7 +2301,7 @@ static void close_sha1_file(int fd) fsync_or_die(fd, "sha1 file"); fchmod(fd, 0444); if (close(fd) != 0) - die("unable to write sha1 file"); + die("error when closing sha1 file (%s)", strerror(errno)); } /* Size of directory component, including the ending '/' */ |