]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Do not lose some conversion error.
authorMichihiro NAKAJIMA <ggcueroad@gmail.com>
Wed, 4 May 2011 09:26:25 +0000 (05:26 -0400)
committerMichihiro NAKAJIMA <ggcueroad@gmail.com>
Wed, 4 May 2011 09:26:25 +0000 (05:26 -0400)
SVN-Revision: 3278

libarchive/archive_read_support_format_tar.c

index f0a504dfd86e67c3e50e898af667c936a9e3f60e..04294017bd4069bf4f832ac1855425f10b4409ca 100644 (file)
@@ -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),