From 4060c1990a9cceb710808bd4b4ab94d2355aefff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Scharfe?= Date: Sat, 17 Aug 2019 18:23:52 +0200 Subject: archive-tar: report wrong pax extended header length MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Junio C Hamano --- archive-tar.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'archive-tar.c') diff --git a/archive-tar.c b/archive-tar.c index 4aabd566fb..181da4e843 100644 --- a/archive-tar.c +++ b/archive-tar.c @@ -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)); } /* -- cgit v1.2.3