diff options
| author | Renato Botelho <renato@netgate.com> | 2016-02-24 07:51:32 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-02-24 07:51:32 -0300 |
| commit | b15d3cfa0625b6816b5b55df864fbda78dc2add8 (patch) | |
| tree | c384e7235e9894678587ee5782698526bdcc340e /contrib | |
| parent | 7c17fc70241a215de420457e10a510834441b90f (diff) | |
| parent | 008df39fd8f9ba2311709c852fa30e39bf891bcf (diff) | |
| download | FreeBSD-src-b15d3cfa0625b6816b5b55df864fbda78dc2add8.zip FreeBSD-src-b15d3cfa0625b6816b5b55df864fbda78dc2add8.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'contrib')
| -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); } /* |
