bin/153154: [patch][libarchive] fix error handling in mtree parsing code

[Mark Johnston]

The following reply was made to PR bin/153154; it has been noted by GNATS.

From: Mark Johnston <markjdb at gmail.com>
To: bug-followup at FreeBSD.org, markjdb at gmail.com
Cc:  
Subject: Re: bin/153154: [patch][libarchive] fix error handling in mtree
 parsing code
Date: Tue, 14 Dec 2010 15:15:57 -0500

 Actually, I think the patch below is the proper way to handle this.
 Otherwise, things like an invalid type specifier (e.g. type=filee) result
 in the same problem as above.
 
 -Mark
 
 diff --git a/lib/libarchive/archive_read_support_format_mtree.c b/lib/libarchive/archive_read_support_format_mtree.c
 index 8643bb8..9295176 100644
 --- a/lib/libarchive/archive_read_support_format_mtree.c
 +++ b/lib/libarchive/archive_read_support_format_mtree.c
 @@ -641,7 +641,7 @@ parse_file(struct archive_read *a, struct archive_entry *entry,
  		    archive_entry_filetype(entry) != AE_IFIFO)
  			mismatched_type = 1;
  
 -		if (mismatched_type) {
 +		if (mismatched_type && r == ARCHIVE_OK) {
  			if ((parsed_kws & MTREE_HAS_OPTIONAL) == 0) {
  				archive_set_error(&a->archive,
  				    ARCHIVE_ERRNO_MISC,