diff options
| author | kientzle <kientzle@FreeBSD.org> | 2007-04-14 08:42:50 +0000 |
|---|---|---|
| committer | kientzle <kientzle@FreeBSD.org> | 2007-04-14 08:42:50 +0000 |
| commit | 571c5243e40d0546bb093ffb58ebf6e6476cfaba (patch) | |
| tree | d084131ccfb0a5ef3d48e89d8581db23e0cce801 /lib/libarchive | |
| parent | d5ef04255ebbf9178a832c6b6f0895d18dc5a5d9 (diff) | |
| download | FreeBSD-src-571c5243e40d0546bb093ffb58ebf6e6476cfaba.zip FreeBSD-src-571c5243e40d0546bb093ffb58ebf6e6476cfaba.tar.gz | |
Fix the build.
N.B. 'ar' format support is broken right now, it's not
passing tests. If I can't find the problem soon, I'll
back out the last commit.
Diffstat (limited to 'lib/libarchive')
| -rw-r--r-- | lib/libarchive/Makefile | 2 | ||||
| -rw-r--r-- | lib/libarchive/archive_read_support_format_ar.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile index e0048ab..36b5dc2 100644 --- a/lib/libarchive/Makefile +++ b/lib/libarchive/Makefile @@ -9,7 +9,7 @@ LDADD= -lbz2 -lz # Major: Bumped ONLY when API/ABI breakage happens (see SHLIB_MAJOR) # Minor: Bumped when significant new features are added # Revision: Bumped on any notable change -VERSION= 2.0.29 +VERSION= 2.0.30 ARCHIVE_API_MAJOR!= echo ${VERSION} | sed -e 's/[^0-9]/./g' -e 's/\..*//' ARCHIVE_API_MINOR!= echo ${VERSION} | sed -e 's/[^0-9]/./g' -e 's/[0-9]*\.//' -e 's/\..*//' diff --git a/lib/libarchive/archive_read_support_format_ar.c b/lib/libarchive/archive_read_support_format_ar.c index 9f765af..e94d8c2 100644 --- a/lib/libarchive/archive_read_support_format_ar.c +++ b/lib/libarchive/archive_read_support_format_ar.c @@ -258,7 +258,7 @@ archive_read_format_ar_read_header(struct archive_read *a, bytes = (a->compression_read_ahead)(a, &b, tab_size); if (bytes <= 0) return (ARCHIVE_FATAL); - if (bytes < tab_size) { + if (bytes < nval) { archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, "Truncated input file"); return (ARCHIVE_FATAL); |
