com php-src: backport this piece from 5.6, related to the #66307 fix: ext/fileinfo/libmagic/readcdf.c

Commit: d7bb09cc1d7d413d7e92128028c0b2a11b21b6da Author: Anatol Belski <ab@php.net> Thu, 24 Apr 2014 19:50:23 +0200 Parents: 03fa5501a84af2bda7d81c732d46d2a68ee0e855 Branches: PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d7bb09cc1d7d413d7e92128028c0b2a11b21b6da Log: backport this piece from 5.6, related to the #66307 fix Bugs: https://bugs.php.net/66307 Changed paths: M ext/fileinfo/libmagic/readcdf.c Diff: diff --git a/ext/fileinfo/libmagic/readcdf.c b/ext/fileinfo/libmagic/readcdf.c index ade10b2..820f24d 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,