From nobody Wed Nov 16 03:23:10 2022 X-Original-To: dev-commits-src-main@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 4NBpKB6X5Yz4hNqY; Wed, 16 Nov 2022 03:23:10 +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 4NBpKB5lmnz4M1C; Wed, 16 Nov 2022 03:23:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668568990; 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=9hzoaEIwep2VJNuA3I0samzfXOwnF5Evr9JIK7prOv0=; b=UOl0QS36dHA2tyIFv6791i4DQ1ENj0Rq0yzXBB+7fK/XUeMNxXAztFkt7dEOo3K4VyA0DI pDmFluhXqTU6VTuUYUsALYcy4+vuSfhJTirI5ARV0UpmHIxBud1tpjQwEiAe0IYK7sL45t 13UNVyWmcqPM96sPmqpj2+AoIOiiiY+wM7WvPECi6nfdk7LDtNydLMtzoN3+vq2mqASJhi wZFj8cQh6c97NdL/z2Fu/PybgXQtGXPexiedcl7lWVrDmzzWhlT0xyElHObI70MTuNRVf/ 7wo5yyrHI/AauSDJy5DVGLnvDd/dg662sSJ1f7mXtYi4wYKLVFfpuAZPIz5zow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668568990; 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=9hzoaEIwep2VJNuA3I0samzfXOwnF5Evr9JIK7prOv0=; b=dZXnNMli3ntjSjWiu8X7KMIDE8gZ8sMTqWveydJTtRWEohPkjY4t0EYy/QlwlsAgRzy6Sd UCvL4bZRkMTdWo9HFIOJtk9qKpr5A7EmOX/3GaPsidpLVNVdpQ1spHutI/34gNfkKhJo+X AvAefhovWRrox8C9mtDD2eatRo9SSp20sWLaLrZf6fEGIiGmM58pU3JysmmtxEkltM3IAb 9QWrzBoEXEsNSyygXdbtn6yrNqRiRKn2trdAr+V6slVaWw323jaT1/AM/uNrwkkORuhTOY GPclNw1XLJKxUWcQY9JljZL2NOUKo9G6KFAsRO/g5B89TNhJWMhdYi+aHtBtag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668568990; a=rsa-sha256; cv=none; b=rG1qG/fZdXfKtLxLVxeTG9H7x/SlaQ9xVwqpoDFcgeUO4bJc4aN2/8GU1q4YiXSxq1uGpZ 1vD4teqXh9lc+xNVBcABMizcAb/d5DzWR4rBYKmK78cLmx3YzfyL2I6OiSdraqeFib1heO cZnGlcRQ31FJXDsTFkAXUJJRFPmp44KuoYSDnOjOkO7lXKoXmwjZ7/IqxGkGXawxguUWgE uXb1Klh6jDcDZ1vcqDwPvSxihCGEd4JrRCBAwgRgKCXVm8rdIo7iz+GkTCA8sln2Pybqff FAoceD2RyZFTl4CBqm+tMUNJbfy266KHtYqmufJlwDfAEvLLBDT1/UP17JlN3A== 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 4NBpKB4pP1zmlS; Wed, 16 Nov 2022 03:23:10 +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 2AG3NARb055748; Wed, 16 Nov 2022 03:23:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AG3NAfe055747; Wed, 16 Nov 2022 03:23:10 GMT (envelope-from git) Date: Wed, 16 Nov 2022 03:23:10 GMT Message-Id: <202211160323.2AG3NAfe055747@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 4e0771714d61 - main - diff: Don't treat null characters like carriage returns in readhash(). List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 4e0771714d6192119dcf7553b921bf88866d8925 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4e0771714d6192119dcf7553b921bf88866d8925 commit 4e0771714d6192119dcf7553b921bf88866d8925 Author: John Baldwin AuthorDate: 2022-11-16 03:16:50 +0000 Commit: John Baldwin CommitDate: 2022-11-16 03:16:50 +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 --- 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 c9111fe7eaee..b5e1f23b2d00 100644 --- a/usr.bin/diff/diffreg.c +++ b/usr.bin/diff/diffreg.c @@ -1338,6 +1338,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); @@ -1356,6 +1357,7 @@ readhash(FILE *f, int flags, unsigned *hash) } /* FALLTHROUGH */ default: + hashchar: if (space && (flags & D_IGNOREBLANKS) == 0) { i++; space = 0;