public inbox for cygwin-apps@cygwin.com
 help / color / mirror / Atom feed
From: Eric Blake <eblake@redhat.com>
To: cygwin-apps@cygwin.com
Subject: [PATCH] src_postinst.cygpart: Sanitize binary data in bash command subst
Date: Fri, 16 Dec 2016 20:41:00 -0000	[thread overview]
Message-ID: <20161216204052.5657-1-eblake@redhat.com> (raw)

bash 4.4 now warns about skipping NUL bytes in $(command), since
command substitution is only well-formed for commands that output
text, but NUL bytes are not text.  Silence the warning by removing
NUL bytes from the stream before bash can see them.
---
 lib/src_postinst.cygpart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src_postinst.cygpart b/lib/src_postinst.cygpart
index 30ad90e..2ae26b6 100644
--- a/lib/src_postinst.cygpart
+++ b/lib/src_postinst.cygpart
@@ -967,14 +967,14 @@ __prepstrip() {
 		# Magic number is at end of file:
 		# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=256900#74
 		# http://cygwin.com/ml/cygwin-apps/2010-10/msg00057.html
-		case $(tail -c 12 "${exe}") in
+		case $(tail -c 12 "${exe}" | tr -d '\0') in
 			Caml1999X0[0-9][0-9])  continue ;;
 		esac

 		# Perl Archive (PAR) binaries must not be stripped
 		# https://rt.cpan.org/Public/Bug/Display.html?id=18536
 		# http://cygwin.com/ml/cygwin-apps/2012-07/msg00088.html
-		case $(tail -c 8 "${exe}" | tr '\012' '%') in
+		case $(tail -c 8 "${exe}" | tr '\012\0' '%') in
 			%PAR\.pm%)  continue ;;
 		esac

-- 
2.9.3

             reply	other threads:[~2016-12-16 20:41 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-16 20:41 Eric Blake [this message]
2016-12-16 20:47 ` Eric Blake
2016-12-16 21:09 ` Eric Blake
2017-01-15 13:02   ` Achim Gratz
2017-01-17 23:02   ` Yaakov Selkowitz

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20161216204052.5657-1-eblake@redhat.com \
    --to=eblake@redhat.com \
    --cc=cygwin-apps@cygwin.com \
    /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.
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).