diff options
| author | tron <tron@pkgsrc.org> | 2015-05-17 08:15:38 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2015-05-17 08:15:38 +0000 |
| commit | bf5722e70cf501fffe60dc1341599454fe8844f0 (patch) | |
| tree | ae2e96f0f9bb7b58e30d9d227aff370d9a102a43 | |
| parent | 8ef05daafe000c07e253ff333ce8e55f176c8a44 (diff) | |
| download | pkgsrc-bf5722e70cf501fffe60dc1341599454fe8844f0.tar.gz | |
Pullup ticket #4715 - requested by sevan
archivers/libarchive: security patch
Revisions pulled up:
- archivers/libarchive/Makefile.common 1.3
- archivers/libarchive/files/libarchive/archive_read.c 1.5
---
Module Name: pkgsrc
Committed By: sevan
Date: Thu May 14 14:54:55 UTC 2015
Modified Files:
pkgsrc/archivers/libarchive: Makefile.common
pkgsrc/archivers/libarchive/files/libarchive: archive_read.c
Log Message:
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@
| -rw-r--r-- | archivers/libarchive/Makefile.common | 3 | ||||
| -rw-r--r-- | archivers/libarchive/files/libarchive/archive_read.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/archivers/libarchive/Makefile.common b/archivers/libarchive/Makefile.common index 3735b706d5c..92211a52c9f 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.2.2.1 2015/05/17 08:15:38 tron 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; |