aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2016-02-23 07:04:54 +0000
committerXin LI <delphij@FreeBSD.org>2016-02-23 07:04:54 +0000
commitc5f9310ca93fd77fba0ac435f0576225cf67689c (patch)
tree4732d23eef437549f2494de5ca9ea863793db1a0
parent25d3ca0980e03d32bf4c9f9f053158a23456fdf6 (diff)
downloadsrc-c5f9310ca93fd77fba0ac435f0576225cf67689c.tar.gz
src-c5f9310ca93fd77fba0ac435f0576225cf67689c.zip
Apply upstream commit 6e06b1c8 (partial, by kientzle):
Fix a potential crash issue discovered by Alexander Cherepanov: It seems bsdtar automatically handles stacked compression. This is a nice feature but it could be problematic when it's completely unlimited. Most clearly it's illustrated with quines: $ curl -sRO http://www.maximumcompression.com/selfgz.gz $ (ulimit -v 10000000 && bsdtar -tvf selfgz.gz) bsdtar: Error opening archive: Can't allocate data for gzip decompression Without ulimit, bsdtar will eat all available memory. This could also be a problem for other applications using libarchive.
Notes
Notes: svn path=/vendor/libarchive/dist/; revision=295913
-rw-r--r--libarchive/archive_read.c7
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);
}
/*