From ef2a2fa3a1a67244532dca90438971c5f9919806 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@php.net>
Date: Wed, 22 Oct 2014 15:24:59 +0200
Subject: [PATCH] Fix bug #68224 buffer-overflow in
 /ext/fileinfo/libmagic/readcdf.c caught by AddressSanitizer

Upstream commit
https://github.com/file/file/commit/f28fbb947e3aa55fc40b09820f59ebff6f66f213
---
 ext/fileinfo/libmagic/readcdf.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ext/fileinfo/libmagic/readcdf.c b/ext/fileinfo/libmagic/readcdf.c
index ec97ced44b..175719a2d7 100644
--- a/ext/fileinfo/libmagic/readcdf.c
+++ b/ext/fileinfo/libmagic/readcdf.c
@@ -88,6 +88,9 @@ static const struct cv {
 		{ 0x00000000000c1084LLU, 0x46000000000000c0LLU },
 #endif
 		"x-msi",
+	},
+	{	{ 0,			 0			},
+		NULL,
 	}
 }, clsid2desc[] = {
 	{
@@ -98,6 +101,9 @@ static const struct cv {
 #endif
 		"MSI Installer",
 	},
+	{	{ 0,			 0			},
+		NULL,
+	}
 };
 
 private const char *
-- 
2.40.0