From 9599d193b84e85bcc0d7015948ed827eb06f1fd1 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 11 Sep 2023 01:17:02 -0500 Subject: [PATCH] quote unknown header keywords in diagnostics * src/xheader.c (decx): Quote unknown header in warning, as it may contain control characters. Problem reported by Wicher Minnaard. --- NEWS | 4 +++- THANKS | 1 + src/xheader.c | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 4a8754cf..4b8094e5 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -GNU tar NEWS - User visible changes. 2023-08-21 +GNU tar NEWS - User visible changes. 2023-09-10 Please send GNU tar bug reports to version TBD @@ -31,6 +31,8 @@ used, command output will be parsed using strptime(3). ** tar no longer uses alloca, fixing an unlikely stack overflow. +** When diagnosing invalid extended headers tar now quotes control characters. + version 1.35 - Sergey Poznyakoff, 2023-07-18 diff --git a/THANKS b/THANKS index aee0a924..b51f1694 100644 --- a/THANKS +++ b/THANKS @@ -535,6 +535,7 @@ Warner Losh imp@boulder.parcplace.com Warren Dodge warrend@sptekwv3.wv.tek.com Wayne Christopher wayne@icemcfd.com Werner Almesberger werner.almesberger@lrc.di.epfl.ch +Wichar Minnaard wicher@gavagai.nl William Bader william@nscs.fast.net William J. Eaton wje@hoffman.rstnu.bcm.tmc.edu William Kucharski kucharsk@netcom.com diff --git a/src/xheader.c b/src/xheader.c index 1347ce18..c82222ed 100644 --- a/src/xheader.c +++ b/src/xheader.c @@ -692,8 +692,8 @@ decx (void *data, char const *keyword, char const *value, size_t size) t->decoder (st, keyword, value, size); else WARNOPT (WARN_UNKNOWN_KEYWORD, - (0, 0, _("Ignoring unknown extended header keyword '%s'"), - keyword)); + (0, 0, _("Ignoring unknown extended header keyword %s"), + quotearg_style (shell_escape_always_quoting_style, keyword))); } void -- 2.47.2