From: Martin Matuska <martin@matuska.org>
Date: Wed, 25 Jan 2017 21:54:14 +0000 (+0100)
Subject: cpio reader: use strncmp() when comparing against TRAILER!!!
X-Git-Tag: v3.3.0~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e7ddf23c928a9f90646afd92729785189858628;p=thirdparty%2Flibarchive.git

cpio reader: use strncmp() when comparing against TRAILER!!!

Reported-By:	OSS-Fuzz issue 422
---

diff --git a/libarchive/archive_read_support_format_cpio.c b/libarchive/archive_read_support_format_cpio.c
index 89f9188cd..d4f6ffd91 100644
--- a/libarchive/archive_read_support_format_cpio.c
+++ b/libarchive/archive_read_support_format_cpio.c
@@ -434,7 +434,8 @@ archive_read_format_cpio_read_header(struct archive_read *a,
 	 * header.  XXX */
 
 	/* Compare name to "TRAILER!!!" to test for end-of-archive. */
-	if (namelength == 11 && strcmp((const char *)h, "TRAILER!!!") == 0) {
+	if (namelength == 11 && memcmp((const char *)h, "TRAILER!!!",
+	    11) == 0) {
 		/* TODO: Store file location of start of block. */
 		archive_clear_error(&a->archive);
 		return (ARCHIVE_EOF);