d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFV r295913:

Browse Source 
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
This commit is contained in:
Xin LI 2016-02-23 07:13:22 +00:00
commit 876964d12a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/libarchive/libarchive/archive_read.c
View File

@ -545,13 +545,13 @@ archive_read_open1(struct archive *_a)
static int static int
choose_filters(struct archive_read *a) 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_bidder *bidder, *best_bidder;
struct archive_read_filter *filter; struct archive_read_filter *filter;
ssize_t avail; ssize_t avail;
int r; int r;
for (;;) { for (n = 0; n < 25; ++n) {
number_bidders = sizeof(a->bidders) / sizeof(a->bidders[0]); number_bidders = sizeof(a->bidders) / sizeof(a->bidders[0]);
best_bid = 0; best_bid = 0;
@ -597,6 +597,9 @@ choose_filters(struct archive_read *a)
return (ARCHIVE_FATAL); return (ARCHIVE_FATAL);
} }
} }
archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
"Input requires too many filters for decoding");
return (ARCHIVE_FATAL);
} }
/* /*