From owner-svn-ports-branches@freebsd.org Thu Oct 29 00:00:42 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B8E40452EFF; Thu, 29 Oct 2020 00:00:42 +0000 (UTC) (envelope-from kevans@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CM5Dp4Z1Mz3VC4; Thu, 29 Oct 2020 00:00:42 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8135F2469B; Thu, 29 Oct 2020 00:00:42 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09T00gTm042520; Thu, 29 Oct 2020 00:00:42 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09T00gUZ042519; Thu, 29 Oct 2020 00:00:42 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202010290000.09T00gUZ042519@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 29 Oct 2020 00:00:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r553571 - branches/2020Q4/devel/llvm10/files X-SVN-Group: ports-branches X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: branches/2020Q4/devel/llvm10/files X-SVN-Commit-Revision: 553571 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Oct 2020 00:00:42 -0000 Author: kevans Date: Thu Oct 29 00:00:42 2020 New Revision: 553571 URL: https://svnweb.freebsd.org/changeset/ports/553571 Log: MFH: r553570 devel/llvm10: really fix the AT_EXECPATH fallback =( It turns out that I made not one but *two* mistakes in applying this patch from the version that I had sent upstream. This one is not an extra semicolon, but rather not dereferencing p... p may never hit AT_NULL, but *p certainly will. The problem was isolated and the fix identified + tested by Andrew Gierth. Reported by: Andrew Gierth Approved by: ports-secteam (blanket: runtime fix) Modified: branches/2020Q4/devel/llvm10/files/patch-lib_Support_Unix_Path.inc Directory Properties: branches/2020Q4/ (props changed) Modified: branches/2020Q4/devel/llvm10/files/patch-lib_Support_Unix_Path.inc ============================================================================== --- branches/2020Q4/devel/llvm10/files/patch-lib_Support_Unix_Path.inc Wed Oct 28 23:58:56 2020 (r553570) +++ branches/2020Q4/devel/llvm10/files/patch-lib_Support_Unix_Path.inc Thu Oct 29 00:00:42 2020 (r553571) @@ -7,7 +7,7 @@ - for (;;) { - switch (*(uintptr_t *)p++) { - case AT_EXECPATH: -+ for (; (uintptr_t *)p != AT_NULL; p++) { ++ for (; *(uintptr_t *)p != AT_NULL; p++) { + if (*(uintptr_t *)p++ == AT_EXECPATH) return *p; - case AT_NULL: