Date: Tue, 23 Feb 2016 08:12:39 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r295915 - stable/9/contrib/libarchive/libarchive Message-ID: <201602230812.u1N8Cdqx001457@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Tue Feb 23 08:12:39 2016 New Revision: 295915 URL: https://svnweb.freebsd.org/changeset/base/295915 Log: Instant-MFC r295914: MFV r295913: Partially apply upstream changeset 6e06b1c8 (kientzle). Limit filter recursion level to 25 (instead of infinite). This fixes a potential crash issue discovered by Alexander Cherepanov. PR: 207362 Reported by: Robert Clausecker Obtained from: libarchive github project Approved by: so Modified: stable/9/contrib/libarchive/libarchive/archive_read.c Directory Properties: stable/9/contrib/libarchive/ (props changed) stable/9/contrib/libarchive/libarchive/ (props changed) Modified: stable/9/contrib/libarchive/libarchive/archive_read.c ============================================================================== --- stable/9/contrib/libarchive/libarchive/archive_read.c Tue Feb 23 07:13:22 2016 (r295914) +++ stable/9/contrib/libarchive/libarchive/archive_read.c Tue Feb 23 08:12:39 2016 (r295915) @@ -352,13 +352,13 @@ archive_read_open2(struct archive *_a, v static int build_stream(struct archive_read *a) { - int number_bidders, i, bid, best_bid; + int number_bidders, i, bid, best_bid, n; struct archive_read_filter_bidder *bidder, *best_bidder; struct archive_read_filter *filter; ssize_t avail; int r; - for (;;) { + for (n = 0; n < 25; ++n) { number_bidders = sizeof(a->bidders) / sizeof(a->bidders[0]); best_bid = 0; @@ -402,6 +402,9 @@ build_stream(struct archive_read *a) return (r); } } + archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, + "Input requires too many filters for decoding"); + return (ARCHIVE_FATAL); } /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602230812.u1N8Cdqx001457>