diff options
| author | delphij <delphij@FreeBSD.org> | 2016-02-23 07:13:22 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2016-02-23 07:13:22 +0000 |
| commit | ed4a49358188d0a1611e2d7381793de17789ac67 (patch) | |
| tree | 607c8e175ff34dd923e0526a7f20dbdb600b451b /contrib/libarchive | |
| parent | c87af0103cd3021f25d30f027794d55097a72310 (diff) | |
| download | FreeBSD-src-ed4a49358188d0a1611e2d7381793de17789ac67.zip FreeBSD-src-ed4a49358188d0a1611e2d7381793de17789ac67.tar.gz | |
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
Diffstat (limited to 'contrib/libarchive')
| -rw-r--r-- | contrib/libarchive/libarchive/archive_read.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/contrib/libarchive/libarchive/archive_read.c b/contrib/libarchive/libarchive/archive_read.c index 9513729..1d4c9bb 100644 --- a/contrib/libarchive/libarchive/archive_read.c +++ b/contrib/libarchive/libarchive/archive_read.c @@ -545,13 +545,13 @@ archive_read_open1(struct archive *_a) static int choose_filters(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; @@ -597,6 +597,9 @@ choose_filters(struct archive_read *a) return (ARCHIVE_FATAL); } } + archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, + "Input requires too many filters for decoding"); + return (ARCHIVE_FATAL); } /* |
