From nobody Tue Jan 24 05:43:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P1G9029xPz3bMxl; Tue, 24 Jan 2023 05:43:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P1G901XgYz4T6X; Tue, 24 Jan 2023 05:43:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674538996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jQCCyd8Yvlrt9+PeTV1y0ZGKaDNBGmJTi5mLxaBOobE=; b=VF5mYLOpVGJJAJYlC2dev/2Gd0baj2KEPvqd+kvK/5VWDKrWh3Pl3prK4dIERHSdZTSMGs 1LikUAQOJYOUMAFzmS7cq/fxAVWSRRZ1pF36xVwcRkKbsSITkI6TN153MnolHPIlnid2c7 5T2nAKnrygk/9Dotv1HXkvQ2zmPcvmQpW9MYRtZv9EG6PEQeE4t1Rtku8pFUW0KOFWVtMD iECOSlRYQ78adAoqEzVmEp0bZIg/1Lta7Nd+tehzYzHuvPKXK5RWAVPIHvaUA5MHZndQ/h zzwVwI4FxTtedqFSUbd9sZoJbyOOnYY2eKPciiyGENPEggmWDswuQdbgkdB8Yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674538996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jQCCyd8Yvlrt9+PeTV1y0ZGKaDNBGmJTi5mLxaBOobE=; b=V8gnYZtGodDc8oI4DkE9dKYR37asodfkeBw7JKARvaeV0A9XqdSlF47LWdTXBinKlpoYaL yy0T42EqikVultU50qxbaSJQh2OcmSL/WpurqDcAns1FJbE7z/2ZeLqc39/nugAWNIhi7S IlYUCKXtuy9/XZj6JMkFTMG7ithfNFNzgllR6UvzD8gLFTkGT2Ygmq3XQksowAOkMcbmDC aqOtweNJd5V4RlHMGjQ+Ce4ls9hEuupwAB2cOd/+xgtFUitekhxuKR6osWqf0VsJBcDnLh 3b22PoYa2rGIHgmtbGp5+gfym4Ol02JwpnhF8UOABRJWsZemIKcQc4EEU+F+8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674538996; a=rsa-sha256; cv=none; b=GXUTO949u3AFxPR9NPikBa+yskYzfcflY18HrR8QgWvscTpQdvIx8mNxbxby8NWfGrGHHV OR5MzQG6uxRoUTjKpNSM0be9pZj53vPktmQRvtxFF7+BsS+fvEmYBtF9s9fRI/mvw034zk Kv+Q1t1cmZA4lsNAsWyjFkzIo+j5pg+mXcr5EsGXMOsdBQKKFqc0yf+B76aDuCMItHSG6R OPaIwh094xV3s6Fic/3AYboVc9AG4yV4uc++IhHaDcjklUuabwyWlnTCMhCDt8EoZVigG2 IHlRW3QGvO24LKQFQripxyv6ee/JUrZjQUCkDnuyPAyddyO9YkpMPz81+0U/5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P1G900f5Bzxw8; Tue, 24 Jan 2023 05:43:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30O5hFNO061833; Tue, 24 Jan 2023 05:43:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30O5hFNI061832; Tue, 24 Jan 2023 05:43:15 GMT (envelope-from git) Date: Tue, 24 Jan 2023 05:43:15 GMT Message-Id: <202301240543.30O5hFNI061832@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 95a52eb29ca9 - stable/13 - diff: Don't treat null characters like carriage returns in readhash(). List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 95a52eb29ca93fb457ac618b8de7a754700e55c4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=95a52eb29ca93fb457ac618b8de7a754700e55c4 commit 95a52eb29ca93fb457ac618b8de7a754700e55c4 Author: John Baldwin AuthorDate: 2022-11-16 03:16:50 +0000 Commit: John Baldwin CommitDate: 2023-01-24 05:12:00 +0000 diff: Don't treat null characters like carriage returns in readhash(). The implicit fall-through in the !D_FORCEASCII case caused null characters to be treated as carriage returns honoring the D_STRIPCR, D_FOLDBLANKS, and D_IGNOREBLANKS flags. Reported by: GCC -Wimplicit-fallthrough Reviewed by: bapt Fixes: 3cbf98e2bee9 diff: read whole files to determine if they are ASCII text Differential Revision: https://reviews.freebsd.org/D36813 (cherry picked from commit 4e0771714d6192119dcf7553b921bf88866d8925) --- usr.bin/diff/diffreg.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c index 72a4d5f25b07..94998a364715 100644 --- a/usr.bin/diff/diffreg.c +++ b/usr.bin/diff/diffreg.c @@ -1376,6 +1376,7 @@ readhash(FILE *f, int flags, unsigned *hash) case '\0': if ((flags & D_FORCEASCII) == 0) return (RH_BINARY); + goto hashchar; case '\r': if (flags & D_STRIPCR) { t = getc(f); @@ -1394,6 +1395,7 @@ readhash(FILE *f, int flags, unsigned *hash) } /* FALLTHROUGH */ default: + hashchar: if (space && (flags & D_IGNOREBLANKS) == 0) { i++; space = 0;