Merge branch 'rs/pax-extended-header-length-fix'

"git archive" recorded incorrect length in extended pax header in
some corner cases, which has been corrected.

* rs/pax-extended-header-length-fix:
archive-tar: turn length miscalculation warning into BUG
archive-tar: use size_t in strbuf_append_ext_header()
archive-tar: fix pax extended header length calculation
archive-tar: report wrong pax extended header length

diff --git a/archive-tar.c b/archive-tar.c
index 3e53aac1e6523571ce0b9cb02d151c1f00652603..e16d3f756ddd61d38477e73b71aa01e912ba2b13 100644 (file)
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -142,19 +142,25 @@ static int stream_blocked(const struct object_id *oid)
  * string and appends it to a struct strbuf.
  */
 static void strbuf_append_ext_header(struct strbuf *sb, const char *keyword,
-                                    const char *value, unsigned int valuelen)
+                                    const char *value, size_t valuelen)
 {
-       int len, tmp;
+       size_t orig_len = sb->len;
+       size_t len, tmp;
 
        /* "%u %s=%s\n" */
        len = 1 + 1 + strlen(keyword) + 1 + valuelen + 1;
-       for (tmp = len; tmp > 9; tmp /= 10)
+       for (tmp = 1; len / 10 >= tmp; tmp *= 10)
                len++;
 
        strbuf_grow(sb, len);
-       strbuf_addf(sb, "%u %s=", len, keyword);
+       strbuf_addf(sb, "%"PRIuMAX" %s=", (uintmax_t)len, keyword);
        strbuf_add(sb, value, valuelen);
        strbuf_addch(sb, '\n');
+
+       if (len != sb->len - orig_len)
+               BUG("pax extended header length miscalculated as %"PRIuMAX
+                   ", should be %"PRIuMAX,
+                   (uintmax_t)len, (uintmax_t)(sb->len - orig_len));
 }
 
 /*

diff --git a/t/t5004-archive-corner-cases.sh b/t/t5004-archive-corner-cases.sh
index 271eb5a1fdfbfe4aab216271fc1897968283639d..3e7b23cb32c581b88473b596036517a38c51c9fd 100755 (executable)
--- a/t/t5004-archive-corner-cases.sh
+++ b/t/t5004-archive-corner-cases.sh
@@ -204,4 +204,23 @@ test_expect_success EXPENSIVE,LONG_IS_64BIT,UNZIP,UNZIP_ZIP64_SUPPORT,ZIPINFO \
        grep $size big.lst
 '
 
+build_tree() {
+       perl -e '
+               my $hash = $ARGV[0];
+               foreach my $order (2..6) {
+                       $first = 10 ** $order;
+                       foreach my $i (-13..-9) {
+                               my $name = "a" x ($first + $i);
+                               print "100644 blob $hash\t$name\n"
+                       }
+               }
+       ' "$1"
+}
+
+test_expect_success 'tar archive with long paths' '
+       blob=$(echo foo | git hash-object -w --stdin) &&
+       tree=$(build_tree $blob | git mktree) &&
+       git archive -o long_paths.tar $tree
+'
+
 test_done