From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Wed, 4 May 2011 09:26:25 +0000 (-0400)
Subject: Do not lose some conversion error.
X-Git-Tag: v3.0.0a~408
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e81e4d24acc79fd2beb5d9cc302e64fbc9b9efb;p=thirdparty%2Flibarchive.git

Do not lose some conversion error.

SVN-Revision: 3278
---

diff --git a/libarchive/archive_read_support_format_tar.c b/libarchive/archive_read_support_format_tar.c
index f0a504dfd..04294017b 100644
--- a/libarchive/archive_read_support_format_tar.c
+++ b/libarchive/archive_read_support_format_tar.c
@@ -1366,7 +1366,9 @@ header_ustar(struct archive_read *a, struct tar *tar,
 	archive_entry_copy_pathname(entry, as->s);
 
 	/* Handle rest of common fields. */
-	err = header_common(a, tar, entry, h);
+	r = header_common(a, tar, entry, h);
+	if (r < err)
+		err = r;
 
 	/* Handle POSIX ustar fields. */
 	r = archive_strncpy_in_locale(&(tar->entry_uname),