From d184f07b3ccc30113ae11dd68f987f6cefe36d79 Mon Sep 17 00:00:00 2001
From: Anatol Belski <ab@php.net>
Date: Thu, 24 Apr 2014 19:50:23 +0200
Subject: [PATCH] backport this piece from 5.6, related to the #66307 fix
---
ext/fileinfo/libmagic/readcdf.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ext/fileinfo/libmagic/readcdf.c b/ext/fileinfo/libmagic/readcdf.c
index ade10b2bf7..820f24d0d7 100644
--- a/ext/fileinfo/libmagic/readcdf.c
+++ b/ext/fileinfo/libmagic/readcdf.c
@@ -149,7 +149,8 @@ cdf_file_property_info(struct magic_set *ms, const cdf_property_info_t *info,
return -1;
}
c = cdf_ctime(&sec, tbuf);
- if ((ec = strchr(c, '\n')) != NULL)
+ if (c != NULL &&
+ (ec = strchr(c, '\n')) != NULL)
*ec = '\0';
if (NOTMIME(ms) && file_printf(ms,
--
2.40.0