From: Andreas Henriksson <andreas@fatal.se>
Date: Fri, 6 Feb 2009 18:54:47 +0000 (-0500)
Subject: Fix off-by-one in Joliet code.
X-Git-Tag: v2.7.0~327
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=524ec3a97bc6713dca5a36c9caee528b4b723204;p=thirdparty%2Flibarchive.git

Fix off-by-one in Joliet code.

Reported by Michihiro NAKAJIMA.

SVN-Revision: 571
---

diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
index c58b98053..899391396 100644
--- a/libarchive/archive_read_support_format_iso9660.c
+++ b/libarchive/archive_read_support_format_iso9660.c
@@ -737,7 +737,7 @@ parse_file_info(struct iso9660 *iso9660, struct file_info *parent,
 		/* convert BE UTF-16 to wchar_t */
 		for (c = p, wp = wbuff;
 				c < (p + name_len) &&
-				wp < (wbuff + sizeof(wbuff)/sizeof(*wbuff));
+				wp < (wbuff + sizeof(wbuff)/sizeof(*wbuff) - 1);
 				c += 2) {
 			*wp++ = (((255 & (int)c[0]) << 8) | (255 & (int)c[1]));
 		}