From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Tue, 13 Oct 2009 18:56:31 +0000 (-0400)
Subject: Add sanity check.
X-Git-Tag: v2.8.0~300
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5f8363da87cc3f88daac733b73d4f767cae7d1bc;p=thirdparty%2Flibarchive.git

Add sanity check.

SVN-Revision: 1514
---

diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
index 4bab50b94..5ee0e6984 100644
--- a/libarchive/archive_read_support_format_iso9660.c
+++ b/libarchive/archive_read_support_format_iso9660.c
@@ -1307,7 +1307,7 @@ parse_file_info(struct archive_read *a, struct file_info *parent,
 		return (NULL);
 	}
 	/* Sanity check that name_len doesn't exceed dr_len. */
-	if (dr_len - 33 < name_len) {
+	if (dr_len - 33 < name_len || name_len == 0) {
 		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 		    "Invalid length of file identifier");
 		return (NULL);