From owner-svn-src-stable-12@freebsd.org Fri Mar 27 17:06:36 2020 Return-Path: Delivered-To: svn-src-stable-12@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 A49B527B533; Fri, 27 Mar 2020 17:06:36 +0000 (UTC) (envelope-from markj@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 48ppDC0yGpz3yF0; Fri, 27 Mar 2020 17:06:35 +0000 (UTC) (envelope-from markj@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 9FD9824A44; Fri, 27 Mar 2020 17:06:25 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02RH6PX2062125; Fri, 27 Mar 2020 17:06:25 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02RH6OnN062121; Fri, 27 Mar 2020 17:06:24 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202003271706.02RH6OnN062121@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Fri, 27 Mar 2020 17:06:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359370 - in stable/12/contrib/elftoolchain: libdwarf libelftc libpe readelf X-SVN-Group: stable-12 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in stable/12/contrib/elftoolchain: libdwarf libelftc libpe readelf X-SVN-Commit-Revision: 359370 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Mar 2020 17:06:36 -0000 Author: markj Date: Fri Mar 27 17:06:24 2020 New Revision: 359370 URL: https://svnweb.freebsd.org/changeset/base/359370 Log: MFC r359172-r359176: elftoolchain coverity fixes Modified: stable/12/contrib/elftoolchain/libdwarf/libdwarf_die.c stable/12/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c stable/12/contrib/elftoolchain/libpe/pe_symtab.c stable/12/contrib/elftoolchain/readelf/readelf.c Directory Properties: stable/12/ (props changed) Modified: stable/12/contrib/elftoolchain/libdwarf/libdwarf_die.c ============================================================================== --- stable/12/contrib/elftoolchain/libdwarf/libdwarf_die.c Fri Mar 27 17:04:46 2020 (r359369) +++ stable/12/contrib/elftoolchain/libdwarf/libdwarf_die.c Fri Mar 27 17:06:24 2020 (r359370) @@ -70,8 +70,7 @@ _dwarf_die_add(Dwarf_CU cu, uint64_t offset, uint64_t die->die_cu = cu; die->die_dbg = cu->cu_dbg; - if (diep != NULL) - *diep = die; + *diep = die; return (DW_DLE_NONE); } Modified: stable/12/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c ============================================================================== --- stable/12/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c Fri Mar 27 17:04:46 2020 (r359369) +++ stable/12/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c Fri Mar 27 17:06:24 2020 (r359370) @@ -2912,7 +2912,7 @@ again: if (len <= 0) goto clean; if (!vector_str_push(&v.ext_name, ddata->cur, len)) - return (0); + goto clean; ddata->cur += len; if (!vector_type_qualifier_push(&v, TYPE_EXT)) goto clean; Modified: stable/12/contrib/elftoolchain/libpe/pe_symtab.c ============================================================================== --- stable/12/contrib/elftoolchain/libpe/pe_symtab.c Fri Mar 27 17:04:46 2020 (r359369) +++ stable/12/contrib/elftoolchain/libpe/pe_symtab.c Fri Mar 27 17:06:24 2020 (r359370) @@ -33,7 +33,7 @@ ELFTC_VCSID("$Id: pe_symtab.c 3312 2016-01-10 09:23:51 int pe_update_symtab(PE *pe, char *symtab, size_t sz, unsigned int nsym) { - PE_Scn *ps; + PE_Scn *ps, *pstmp; PE_SecBuf *sb; PE_SecHdr *sh; @@ -48,7 +48,7 @@ pe_update_symtab(PE *pe, char *symtab, size_t sz, unsi } /* Remove the old symbol table. */ - STAILQ_FOREACH(ps, &pe->pe_scn, ps_next) { + STAILQ_FOREACH_SAFE(ps, &pe->pe_scn, ps_next, pstmp) { if (ps->ps_ndx == 0xFFFFFFFFU) libpe_release_scn(ps); } Modified: stable/12/contrib/elftoolchain/readelf/readelf.c ============================================================================== --- stable/12/contrib/elftoolchain/readelf/readelf.c Fri Mar 27 17:04:46 2020 (r359369) +++ stable/12/contrib/elftoolchain/readelf/readelf.c Fri Mar 27 17:06:24 2020 (r359370) @@ -5915,6 +5915,7 @@ dump_dwarf_frame_regtable(struct readelf *re, Dwarf_Fd for (; cur_pc < end_pc; cur_pc++) { if (dwarf_get_fde_info_for_all_regs(fde, cur_pc, &rt, &row_pc, &de) != DW_DLV_OK) { + free(vec); warnx("dwarf_get_fde_info_for_all_regs failed: %s\n", dwarf_errmsg(de)); return (-1); @@ -7088,6 +7089,7 @@ dump_ar(struct readelf *re, int fd) } printf("Binary %s(%s) contains:\n", re->filename, arhdr->ar_name); + elf_end(e); } printf("\t%s\n", arsym[i].as_name); }