From: Anatol Belski <ab@php.net>
Date: Thu, 24 Apr 2014 17:50:23 +0000 (+0200)
Subject: backport this piece from 5.6, related to the #66307 fix
X-Git-Tag: php-5.5.13RC1~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d7bb09cc1d7d413d7e92128028c0b2a11b21b6da;p=php

backport this piece from 5.6, related to the #66307 fix
---

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,