undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
"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
This commit is contained in:
Junio C Hamano 2019-09-09 12:26:37 -07:00
commit af2b8faf49
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
archive-tar.c
View File

@ -142,19 +142,25 @@ static int stream_blocked(const struct object_id *oid)
* string and appends it to a struct strbuf. * string and appends it to a struct strbuf.
*/ */
static void strbuf_append_ext_header(struct strbuf *sb, const char *keyword, 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" */ /* "%u %s=%s\n" */
len = 1 + 1 + strlen(keyword) + 1 + valuelen + 1; len = 1 + 1 + strlen(keyword) + 1 + valuelen + 1;
for (tmp = len; tmp > 9; tmp /= 10) for (tmp = 1; len / 10 >= tmp; tmp *= 10)
len++; len++;
strbuf_grow(sb, 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_add(sb, value, valuelen);
strbuf_addch(sb, '\n'); 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));
} }
/* /*

19
t/t5004-archive-corner-cases.sh
View File

@ -204,4 +204,23 @@ test_expect_success EXPENSIVE,LONG_IS_64BIT,UNZIP,UNZIP_ZIP64_SUPPORT,ZIPINFO \
grep $size big.lst 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 test_done