From nobody Sat Feb 19 00:19:09 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 A295A19D7954; Sat, 19 Feb 2022 00:19:09 +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 4K0q1T34N4z3pFb; Sat, 19 Feb 2022 00:19:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645229949; 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=bvns+MapPVIAOdMunkXdRUk5wSbT5Km+fH033BE/yYI=; b=nqPvwu8xZ4Lgu57cSnj6+/dO6a1KhYetFwATDdhcA8DBQ6hXzu2RZpdcl6tGBEdCMA37+O VUahuXkJHOVsMvnqdORBDyu0vSUfQMMrR0eEA7TC1oidSLGRiym9/ZO33V+UQFpN7t7Uwj P9gu9rBB0dPhMgMFaCxqlZdBJjZIgSzAOAnK+ufCrtgwVii1eqcneewNC9nylKO8e3/1d4 ozWhh+Hijrh0DMaiUV48djzthDmzeNjj/ddcFhxshSgHMp3y8wqKBh38s3alhDf+iOLwWv 0o08Rf+scqw+9+/2neTECsNsEml7GLH6RwUveK0vDvPRm9P2lw1xFTJXM+c2Ag== 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 49FF526E77; Sat, 19 Feb 2022 00:19:09 +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 21J0J9J4033109; Sat, 19 Feb 2022 00:19:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21J0J9k8033108; Sat, 19 Feb 2022 00:19:09 GMT (envelope-from git) Date: Sat, 19 Feb 2022 00:19:09 GMT Message-Id: <202202190019.21J0J9k8033108@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 47a2e541dc68 - main - libarchive: merge vendor bugfixes 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: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 47a2e541dc68cfcc49e5ab9e6020227e3b0db2d7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645229949; 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=bvns+MapPVIAOdMunkXdRUk5wSbT5Km+fH033BE/yYI=; b=nJpLpxHjKoClOtGwTOrKRTjIdRSWEwS4bkPZdin4yT/ghUKGu1FWJ1ag63FydTPIW1QpTD gI/srah7HWuWK6Go1E9jmBNVNstvGFzElRXeyR9ujbLsxZXnkbuhXq5vgrrLGLdB+QEfQ+ fGg5b9fORUaKrWFTp5ZDzi6yk31WLbI7OEn42WB0lAHe6hFDbpxc4AMn1Bc+BFJkypqCs3 u75WfzBlTKBC9Cs0QkkmE/k3eg5ElRPWdQWTZDqAhnfLwJHXCCxjek0xa6Z8cgE86mXk9D p8fO0/YIhSHzJX6KnGiB8gx1BJDeMcmnFEiRaE7lLeAD3n/ZPt8se9vHxJNF3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645229949; a=rsa-sha256; cv=none; b=kBkGMAAwFzRO3dH6cf0/uHK1OcPKVA8D+DqMf5WMJ1nWLzoNfqyhe5AmEWD64KcNQO6OHC FB+Mg2sPe3Rhv/GZaeYEmDzg3mntN8VZJzVKbk06icyn79UjMNdR7cEIEQeUbED605EUNg VWu4fG7Gu/atohYZctmm1doi4dkXDk6PR7ls7nw+DWJyA2R3LCNqHMtkMb7ZLLZKRD7S2t 6DQTN9KcIIdgtEpTIxOsOhuiSKSkDc8YWsMluo4jmQx5oqUfCPCcLRL6t6JPjeM7ALIJDf KJJOlAUisr4tn2oHWF388bRuVfqM2VSzp2SQzH7rWibQgqRdotzUsDwtM4AFJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=47a2e541dc68cfcc49e5ab9e6020227e3b0db2d7 commit 47a2e541dc68cfcc49e5ab9e6020227e3b0db2d7 Merge: bd6e8729d6f6 3c540f969430 Author: Martin Matuska AuthorDate: 2022-02-18 23:57:56 +0000 Commit: Martin Matuska CommitDate: 2022-02-19 00:00:15 +0000 libarchive: merge vendor bugfixes Bugfixes: OSS-Fuzz #44547: fix heap-use-after-free in RAR (v4) filter code PR #1671: Fix 7z PPMD reading beyond boundary X-MFC-with: 833a452e9d .../libarchive/libarchive/archive_blake2s_ref.c | 3 +- .../libarchive/libarchive/archive_blake2sp_ref.c | 3 +- .../libarchive/archive_read_support_format_7zip.c | 29 +- .../libarchive/archive_read_support_format_rar.c | 46 +- .../libarchive/test/test_read_format_rar_filter.c | 10 +- .../test/test_read_format_rar_filter.rar.uu | 28745 ++----------------- .../libarchive/test/test_read_format_zip.c | 31 +- .../test/test_read_format_zip_winzip_aes.c | 2 +- .../test/test_read_format_zip_winzip_aes_large.c | 8 +- 9 files changed, 2188 insertions(+), 26689 deletions(-)