From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Fri, 17 Dec 2010 04:27:08 +0000 (-0500)
Subject: Make sure a check of a filename in joliet extension does not access
X-Git-Tag: v3.0.0a~817
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28870b5a4f5641f320fa3f924fee0607a7f07e53;p=thirdparty%2Flibarchive.git

Make sure a check of a filename in joliet extension does not access
invalid address.

SVN-Revision: 2829
---

diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
index 714f5271b..efc2d4e15 100644
--- a/libarchive/archive_read_support_format_iso9660.c
+++ b/libarchive/archive_read_support_format_iso9660.c
@@ -1785,7 +1785,7 @@ parse_file_info(struct archive_read *a, struct file_info *parent,
 		 *       *, /, :, ;, ? and \.
 		 */
 		/* Chop off trailing ';1' from files. */
-		if (*(wp-2) == L';' && *(wp-1) == L'1') {
+		if (wp > (wbuff + 2) && *(wp-2) == L';' && *(wp-1) == L'1') {
 			wp-=2;
 			*wp = L'\0';
 		}