From: Tim Kientzle <kientzle@gmail.com>
Date: Sun, 19 Apr 2009 21:36:38 +0000 (-0400)
Subject: Merge r1028 from trunk:  Exit with ARCHIVE_FATAL on a truncated
X-Git-Tag: v2.7.1~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be21cd987428ee16b3cfa5ec6cdc88d0dd065cea;p=thirdparty%2Flibarchive.git

Merge r1028 from trunk:  Exit with ARCHIVE_FATAL on a truncated
ISO archive.

SVN-Revision: 1029
---

diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
index c45872a8b..1921c5809 100644
--- a/libarchive/archive_read_support_format_iso9660.c
+++ b/libarchive/archive_read_support_format_iso9660.c
@@ -683,7 +683,7 @@ archive_read_format_iso9660_read_data(struct archive_read *a,
 	if (bytes_read == 0)
 		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 		    "Truncated input file");
-	if (buff == NULL)
+	if (*buff == NULL)
 		return (ARCHIVE_FATAL);
 	if (bytes_read > iso9660->entry_bytes_remaining)
 		bytes_read = iso9660->entry_bytes_remaining;