From: "René Scharfe" <l.s.r@web.de>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: Jeff King <peff@peff.net>,
Keegan Carruthers-Smith <keegan.csmith@gmail.com>,
git@vger.kernel.org
Subject: Re: git archive generates tar with malformed pax extended attribute
Date: Sun, 26 May 2019 23:33:20 +0200 [thread overview]
Message-ID: <2b52ca7b-bb72-193a-9d6b-83003ce49424@web.de> (raw)
In-Reply-To: <877eaefdkt.fsf@evledraar.gmail.com>
Am 25.05.19 um 23:07 schrieb Ævar Arnfjörð Bjarmason:
>
> On Sat, May 25 2019, René Scharfe wrote:
>
>> We could truncate symlink targets at the first NUL as well in git
>> archive -- but that would be a bit sad, as the archive formats allow
>> storing the "real" target from the repo, with NUL and all.
> But that being said, this assumption that data in a tar archive will get
> written to a FS of some sort isn't true. There's plenty of consumers of
> the format that read it in-memory and stream its contents out to
> something else entirely, e.g. taking "git archive --remote" output,
> parsing it with e.g. [1] and throwing some/all of the content into a
> database.
>
> 1. https://metacpan.org/pod/Archive::Tar
Git archive writes link targets that are 100 characters long or less
into the appropriate field in the plain tar header. It copies
everything, including NULs, but unlike a PAX extended header that field
lacks a length indicator, so extractors basically have to treat it as
NUL-terminated.
If we want to preserve NUL in short link targets as well, we'd have to
put such names into an PAX extended header..
---
archive-tar.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/archive-tar.c b/archive-tar.c
index 3e53aac1e6..e8f55578d1 100644
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -291,7 +291,8 @@ static int write_tar_entry(struct archiver_args *args,
}
if (S_ISLNK(mode)) {
- if (size > sizeof(header.linkname)) {
+ if (size > sizeof(header.linkname) ||
+ memchr(buffer, '\0', size)) {
xsnprintf(header.linkname, sizeof(header.linkname),
"see %s.paxheader", oid_to_hex(oid));
strbuf_append_ext_header(&ext_header, "linkpath",
--
2.21.0
next prev parent reply other threads:[~2019-05-26 21:34 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-24 6:45 git archive generates tar with malformed pax extended attribute Keegan Carruthers-Smith
2019-05-24 7:06 ` Jeff King
2019-05-24 7:35 ` Keegan Carruthers-Smith
2019-05-24 8:13 ` Jeff King
2019-05-25 13:26 ` René Scharfe
2019-05-25 13:46 ` Andreas Schwab
2019-05-25 21:07 ` Ævar Arnfjörð Bjarmason
2019-05-26 21:33 ` René Scharfe [this message]
2019-05-28 5:44 ` Jeff King
2019-05-28 5:58 ` Jeff King
2019-05-28 18:01 ` René Scharfe
2019-05-28 19:08 ` Jeff King
2019-05-28 23:34 ` René Scharfe
2019-05-29 1:17 ` Jeff King
2019-05-29 17:54 ` René Scharfe
2019-05-30 11:55 ` Jeff King
2019-06-02 16:58 ` René Scharfe
2019-06-04 20:53 ` Jeff King
2019-05-27 5:11 ` Keegan Carruthers-Smith
2019-05-25 20:46 ` Ævar Arnfjörð Bjarmason
2019-05-25 21:19 ` brian m. carlson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2b52ca7b-bb72-193a-9d6b-83003ce49424@web.de \
--to=l.s.r@web.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=keegan.csmith@gmail.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).