From: Tim Kientzle <kientzle@gmail.com>
Date: Fri, 4 Sep 2009 04:21:50 +0000 (-0400)
Subject: Don't report a negative error code as a count of available bytes.
X-Git-Tag: v2.8.0~387
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5be9ec035e149246e42198c6317fa0f9d2ec3fb;p=thirdparty%2Flibarchive.git

Don't report a negative error code as a count of available bytes.
In this case, any error means there are zero bytes available.

SVN-Revision: 1420
---

diff --git a/libarchive/archive_read.c b/libarchive/archive_read.c
index f1c625d31..c72e27d02 100644
--- a/libarchive/archive_read.c
+++ b/libarchive/archive_read.c
@@ -1150,6 +1150,8 @@ __archive_read_skip(struct archive_read *a, int64_t request)
 	if (skipped == request)
 		return (skipped);
 	/* We hit EOF before we satisfied the skip request. */
+	if (skipped < 0)  // Map error code to 0 for error message below.
+		skipped = 0;
 	archive_set_error(&a->archive,
 	    ARCHIVE_ERRNO_MISC,
 	    "Truncated input file (needed %jd bytes, only %jd available)",