From owner-svn-src-head@freebsd.org Wed May 10 16:27:04 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 28CCBD660A7; Wed, 10 May 2017 16:27:04 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-wr0-f179.google.com (mail-wr0-f179.google.com [209.85.128.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B8EC9170B; Wed, 10 May 2017 16:27:03 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-wr0-f179.google.com with SMTP id l9so712688wre.1; Wed, 10 May 2017 09:27:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:reply-to:in-reply-to:references :from:date:message-id:subject:to:cc; bh=77Su0Lvqgqyrv33J+IoEMw3flivEAJmA7iHsls6kadM=; b=j9lXG2pmtNxWcNIIiCpTKI0wzt5GtFtlPcnah7FFVKrqiByvAkhhJMGnv5+RZVY8B7 QOH2l+Wnkv7WcunBOnyBk5vbZSkyYjZ4L5QqAbT5QEaObc5BKtz/H/BLI+B3rLEAxU49 TscWyexGLkJTCPt3ymd4PXozBgDVWoZE8MFeTugcLe+ugPuvauChELQAXgE/AsaY5Bwq NuPH1SkLKwqONxBhsSRqNUYAf3i/QsFoDcwaSQjkwrQDY22bPn7t2dVaEQPmEAV2xouI q5DNnPPi5U6dEbCPMKDAkWHOgKSAiocdrsFJ5VmXXBqdlCYA91nRDl9uRVYFg7kAeC5p qVsQ== X-Gm-Message-State: AODbwcCqXhqlGEsHF4KlMHMV6xEURmDODZ+z2TrvWrdAfMdvSn9uirOs 9c65GiBDACytoskzPQU= X-Received: by 10.223.139.150 with SMTP id o22mr4357960wra.118.1494429688542; Wed, 10 May 2017 08:21:28 -0700 (PDT) Received: from mail-wm0-f52.google.com (mail-wm0-f52.google.com. [74.125.82.52]) by smtp.gmail.com with ESMTPSA id s81sm3903637wms.6.2017.05.10.08.21.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 May 2017 08:21:28 -0700 (PDT) Received: by mail-wm0-f52.google.com with SMTP id 142so3038371wma.1; Wed, 10 May 2017 08:21:28 -0700 (PDT) X-Received: by 10.80.186.201 with SMTP id x67mr4789064ede.46.1494429688179; Wed, 10 May 2017 08:21:28 -0700 (PDT) MIME-Version: 1.0 Reply-To: cem@freebsd.org Received: by 10.80.169.4 with HTTP; Wed, 10 May 2017 08:21:27 -0700 (PDT) In-Reply-To: <201705040004.v4404Hru044263@repo.freebsd.org> References: <201705040004.v4404Hru044263@repo.freebsd.org> From: Conrad Meyer Date: Wed, 10 May 2017 08:21:27 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r317782 - in head: contrib/libarchive/cpio contrib/libarchive/cpio/test contrib/libarchive/libarchive contrib/libarchive/libarchive/test contrib/libarchive/test_utils lib/libarchive/tests To: Martin Matuska Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 May 2017 16:27:04 -0000 Hi Martin, One minor Coverity nit below: On Wed, May 3, 2017 at 5:04 PM, Martin Matuska wrote: > Author: mm > Date: Thu May 4 00:04:17 2017 > New Revision: 317782 > URL: https://svnweb.freebsd.org/changeset/base/317782 > > Log: > MFV r317781: > Sync libarchive with vendor > > Vendor changes (FreeBSD-related): > PR 897: add test for ZIP archives with invalid EOCD headers > PR 901: fix invalid renaming of sparse files > OSS-Fuzz issue 497: remove fallback tree in LZX decoder > OSS-Fuzz issue 527: rewrite expressions in lz4 filter > OSS-Fuzz issue 577: fix integer overflow in cpio reader > OSS-Fuzz issue 862: fix numerc parsing in mtree reader > OSS-Fuzz issue 1097: fix undefined shift in rar reader > cpio: various optimizations and memory leak fixes > > MFC after: 1 week > > ... > Modified: head/contrib/libarchive/cpio/test/test_option_lz4.c > ============================================================================== > --- head/contrib/libarchive/cpio/test/test_option_lz4.c Wed May 3 23:55:12 2017 (r317781) > +++ head/contrib/libarchive/cpio/test/test_option_lz4.c Thu May 4 00:04:17 2017 (r317782) > ... > @@ -68,14 +71,18 @@ DEFINE_TEST(test_option_lz4) > if (strstr(p, "Error closing") != NULL && !canLz4()) { > skipping("This version of bsdcpio uses an external lz4 program " > "but no such program is available on this system."); > + free(p); > return; > } > + free(p); > failure("--lz4 option is broken: %s", p); p is used after free here. Coverity CID 1374948. Best, Conrad > assertEqualInt(r, 0); > return; > } > + free(p); > /* Check that the archive file has an lz4 signature. */ > p = slurpfile(&s, "archive.out"); > assert(s > 2); > assertEqualMem(p, "\x04\x22\x4d\x18", 4); > + free(p); > } > ...