Merge branch 'maint'

* maint:
Increase the size of the die/warning buffer to avoid truncation
close_sha1_file(): make it easier to diagnose errors
avoid possible overflow in delta size filtering computation

diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 1c6d2c498bae77aab0aaf32ba6f857fbb7ead44f..2000d97ec406a439db81542684f77ebbec9d0172 100644 (file)
--- 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 456317356f323eb744c207d787a2e7598ad9601e..54972f97e004e2794416baac2f79806a608dc88e 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2287,7 +2287,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 '/' */

diff --git a/usage.c b/usage.c
index 24f5fc00c2501c1a1cc317f0b74b458ea50c8b0e..820d09f92b03b6cc96fbe9a954c37fd2d5e5a417 100644 (file)
--- a/usage.c
+++ b/usage.c
@@ -7,7 +7,7 @@
 
 static void report(const char *prefix, const char *err, va_list params)
 {
-       char msg[256];
+       char msg[1024];
        vsnprintf(msg, sizeof(msg), err, params);
        fprintf(stderr, "%s%s\n", prefix, msg);
 }