From owner-svn-src-releng@freebsd.org Tue Aug 6 17:08:31 2019 Return-Path: Delivered-To: svn-src-releng@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 7F594C5E1D; Tue, 6 Aug 2019 17:08:31 +0000 (UTC) (envelope-from gordon@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) server-signature RSA-PSS (4096 bits) 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 4631LR2nhXz4DQ5; Tue, 6 Aug 2019 17:08:31 +0000 (UTC) (envelope-from gordon@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 415062F12C; Tue, 6 Aug 2019 17:08:31 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x76H8VFc037714; Tue, 6 Aug 2019 17:08:31 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x76H8Upt037712; Tue, 6 Aug 2019 17:08:30 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201908061708.x76H8Upt037712@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Tue, 6 Aug 2019 17:08:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r350642 - in releng: 11.2/contrib/llvm/projects/libunwind/src 12.0/contrib/llvm/projects/libunwind/src X-SVN-Group: releng X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: in releng: 11.2/contrib/llvm/projects/libunwind/src 12.0/contrib/llvm/projects/libunwind/src X-SVN-Commit-Revision: 350642 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Aug 2019 17:08:31 -0000 Author: gordon Date: Tue Aug 6 17:08:30 2019 New Revision: 350642 URL: https://svnweb.freebsd.org/changeset/base/350642 Log: Fix incorrect exception handling. Approved by: so Security: FreeBSD-EN-19:15.libunwind Modified: releng/11.2/contrib/llvm/projects/libunwind/src/EHHeaderParser.hpp releng/12.0/contrib/llvm/projects/libunwind/src/EHHeaderParser.hpp Modified: releng/11.2/contrib/llvm/projects/libunwind/src/EHHeaderParser.hpp ============================================================================== --- releng/11.2/contrib/llvm/projects/libunwind/src/EHHeaderParser.hpp Tue Aug 6 17:07:43 2019 (r350641) +++ releng/11.2/contrib/llvm/projects/libunwind/src/EHHeaderParser.hpp Tue Aug 6 17:08:30 2019 (r350642) @@ -68,7 +68,9 @@ void EHHeaderParser::decodeEHHdr(A &addressSpace, p ehHdrInfo.eh_frame_ptr = addressSpace.getEncodedP(p, ehHdrEnd, eh_frame_ptr_enc, ehHdrStart); ehHdrInfo.fde_count = - addressSpace.getEncodedP(p, ehHdrEnd, fde_count_enc, ehHdrStart); + fde_count_enc == DW_EH_PE_omit + ? 0 + : addressSpace.getEncodedP(p, ehHdrEnd, fde_count_enc, ehHdrStart); ehHdrInfo.table = p; } Modified: releng/12.0/contrib/llvm/projects/libunwind/src/EHHeaderParser.hpp ============================================================================== --- releng/12.0/contrib/llvm/projects/libunwind/src/EHHeaderParser.hpp Tue Aug 6 17:07:43 2019 (r350641) +++ releng/12.0/contrib/llvm/projects/libunwind/src/EHHeaderParser.hpp Tue Aug 6 17:08:30 2019 (r350642) @@ -68,7 +68,9 @@ void EHHeaderParser::decodeEHHdr(A &addressSpace, p ehHdrInfo.eh_frame_ptr = addressSpace.getEncodedP(p, ehHdrEnd, eh_frame_ptr_enc, ehHdrStart); ehHdrInfo.fde_count = - addressSpace.getEncodedP(p, ehHdrEnd, fde_count_enc, ehHdrStart); + fde_count_enc == DW_EH_PE_omit + ? 0 + : addressSpace.getEncodedP(p, ehHdrEnd, fde_count_enc, ehHdrStart); ehHdrInfo.table = p; }