diff options
author | kientzle <kientzle@FreeBSD.org> | 2009-03-06 06:13:25 +0000 |
---|---|---|
committer | kientzle <kientzle@FreeBSD.org> | 2009-03-06 06:13:25 +0000 |
commit | 3de75120b94ae8adefacf4c21c522de03879132e (patch) | |
tree | 15234979bb52008fda29db57ee69e3ba0c9de871 /lib | |
parent | a6d71699e11ca2aa4e0f92a369ac8071b9eb85c0 (diff) | |
download | FreeBSD-src-3de75120b94ae8adefacf4c21c522de03879132e.zip FreeBSD-src-3de75120b94ae8adefacf4c21c522de03879132e.tar.gz |
Merge r541,r542 from libarchive.googlecode.com: Two sign mismatches
in the Zip reader.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/libarchive/archive_read_support_format_zip.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/libarchive/archive_read_support_format_zip.c b/lib/libarchive/archive_read_support_format_zip.c index cc7a33d..ccb675d 100644 --- a/lib/libarchive/archive_read_support_format_zip.c +++ b/lib/libarchive/archive_read_support_format_zip.c @@ -172,7 +172,7 @@ archive_read_format_zip_bid(struct archive_read *a) { const char *p; const void *buff; - size_t bytes_avail, offset; + ssize_t bytes_avail, offset; if ((p = __archive_read_ahead(a, 4, NULL)) == NULL) return (-1); @@ -241,7 +241,8 @@ skip_sfx(struct archive_read *a) { const void *h; const char *p, *q; - size_t skip, bytes; + size_t skip; + ssize_t bytes; /* * TODO: We should be able to skip forward by a bunch |