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

From: Date: Tue, 27 May 2014 19:16:06 +0000
Subject: com php-src: backport this piece from 5.6, related to the #66307 fix: ext/fileinfo/libmagic/readcdf.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-78583@lists.php.net to get a copy of this message
Commit: 41f01c28bc266631e742713add1f8f184284636a Author: Anatol Belski <ab@php.net> Thu, 24 Apr 2014 19:50:23 +0200 Committer: Stanislav Malyshev <stas@php.net> Tue, 27 May 2014 12:16:06 -0700 Parents: 4dbe191b61cbcc3943e4367c0e903dacf54ab22a Branches: PHP-5.4.29 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=41f01c28bc266631e742713add1f8f184284636a 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,

« previous php.cvs (#78583) next »