summaryrefslogtreecommitdiff
path: root/archivers
diff options
context:
space:
mode:
authorsevan <sevan@pkgsrc.org>2015-05-14 14:54:55 +0000
committersevan <sevan@pkgsrc.org>2015-05-14 14:54:55 +0000
commit6e149a77d9e1a46f0db4f8b71550c0df3c218703 (patch)
tree6a228297f4fec888955705d53a556f0ea226d7e6 /archivers
parent6e2e0ca44359ce7f33d3a6760b41d8bb9946e3b6 (diff)
downloadpkgsrc-6e149a77d9e1a46f0db4f8b71550c0df3c218703.tar.gz
Patch an out of bounds reads obtained from:
https://github.com/libarchive/libarchive/issues/502 https://github.com/libarchive/libarchive/commit/e6c9668f3202215ddb71617b41c19b6f05acf008 Bump PKGREVISION. Reviewed by bsiegert@
Diffstat (limited to 'archivers')
-rw-r--r--archivers/libarchive/Makefile.common3
-rw-r--r--archivers/libarchive/files/libarchive/archive_read.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/archivers/libarchive/Makefile.common b/archivers/libarchive/Makefile.common
index 3735b706d5c..5dd7935d64e 100644
--- a/archivers/libarchive/Makefile.common
+++ b/archivers/libarchive/Makefile.common
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.common,v 1.2 2015/02/08 00:14:33 wiz Exp $
+# $NetBSD: Makefile.common,v 1.3 2015/05/14 14:54:55 sevan Exp $
# used by archivers/bsdtar/Makefile
# used by archivers/libarchive/Makefile
DISTNAME= libarchive-3.1.2
+PKGREVISION= 1
CATEGORIES= archivers
MASTER_SITES= http://www.libarchive.org/downloads/
DISTFILES= # empty
diff --git a/archivers/libarchive/files/libarchive/archive_read.c b/archivers/libarchive/files/libarchive/archive_read.c
index 048c316c52d..7f3edc1567d 100644
--- a/archivers/libarchive/files/libarchive/archive_read.c
+++ b/archivers/libarchive/files/libarchive/archive_read.c
@@ -1394,6 +1394,8 @@ __archive_read_filter_consume(struct archive_read_filter * filter,
{
int64_t skipped;
+ if (request < 0)
+ return ARCHIVE_FATAL;
if (request == 0)
return 0;