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

archive-tar: report wrong pax extended header length

Browse Source 
Extended header entries contain a length value that is a bit tricky to
calculate because it includes its own length (number of decimal digits)
as well.  We get it wrong in corner cases.  Add a check, report wrong
results as a warning and add a test for exercising it.

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2019-08-17 18:23:52 +02:00 committed by Junio C Hamano
parent aeb582a983
commit 4060c1990a
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archive-tar.c
View File

@ -144,6 +144,7 @@ static int stream_blocked(const struct object_id *oid)
static void strbuf_append_ext_header(struct strbuf *sb, const char *keyword,
const char *value, unsigned int valuelen)
{
size_t orig_len = sb->len;
int len, tmp;
/* "%u %s=%s\n" */
@ -155,6 +156,11 @@ static void strbuf_append_ext_header(struct strbuf *sb, const char *keyword,
strbuf_addf(sb, "%u %s=", len, keyword);
strbuf_add(sb, value, valuelen);
strbuf_addch(sb, '\n');
if (len != sb->len - orig_len)
warning("pax extended header length miscalculated as %d"
", should be %"PRIuMAX,
len, (uintmax_t)(sb->len - orig_len));
}
/*

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

@ -204,4 +204,24 @@ 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_failure '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 2>stderr &&
test_must_be_empty stderr
'
test_done