diff options
| author | Xin LI <delphij@FreeBSD.org> | 2016-02-23 07:04:54 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2016-02-23 07:04:54 +0000 |
| commit | c5f9310ca93fd77fba0ac435f0576225cf67689c (patch) | |
| tree | 4732d23eef437549f2494de5ca9ea863793db1a0 | |
| parent | 25d3ca0980e03d32bf4c9f9f053158a23456fdf6 (diff) | |
Notes
| -rw-r--r-- | libarchive/archive_read.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libarchive/archive_read.c b/libarchive/archive_read.c index 7f3edc1567dd..eb8a5b0bc444 100644 --- a/libarchive/archive_read.c +++ b/libarchive/archive_read.c @@ -544,13 +544,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; @@ -596,6 +596,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); } /* |