com php-src: Fixed bug #66307 Fileinfo crashes with powerpoint files: ext/fileinfo/libmagic/readcdf.c ext/fileinfo/tests/finfo_file _002.phpt
ext/fileinfo/tests/resources/test.ppt

Commit: 0335d2ef3efbcb5f45e753a34fd7b74188997d87 Author: Anatol Belski <ab@php.net> Thu, 24 Apr 2014 19:30:34 +0200 Committer: Stanislav Malyshev <stas@php.net> Fri, 18 Jul 2014 15:48:18 -0700 Parents: a0bb3fd6793fe16dbf4d3b5eb3413093088a6b37 Branches: PHP-5.3 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0335d2ef3efbcb5f45e753a34fd7b74188997d87 Log: Fixed bug #66307 Fileinfo crashes with powerpoint files Conflicts: ext/fileinfo/libmagic/readcdf.c ext/fileinfo/tests/finfo_file_002.phpt Bugs: https://bugs.php.net/66307 Changed paths: M ext/fileinfo/libmagic/readcdf.c M ext/fileinfo/tests/finfo_file_002.phpt A ext/fileinfo/tests/resources/test.ppt Diff: diff --git a/ext/fileinfo/libmagic/readcdf.c b/ext/fileinfo/libmagic/readcdf.c index 0c28ffb..dc6bcf0 100644 --- a/ext/fileinfo/libmagic/readcdf.c +++ b/ext/fileinfo/libmagic/readcdf.c @@ -56,6 +56,8 @@ cdf_file_property_info(struct magic_set *ms, const cdf_property_info_t *info, const char *s; int len; + memset(&ts, 0, sizeof(ts)); + for (i = 0; i < count; i++) { cdf_print_property_name(buf, sizeof(buf), info[i].pi_id); switch (info[i].pi_type) { @@ -142,10 +144,11 @@ cdf_file_property_info(struct magic_set *ms, const cdf_property_info_t *info, return -1; } else { char *c, *ec; + const time_t sec = ts..tv_sec; if (cdf_timestamp_to_timespec(&ts, tp) == -1) { return -1; } - c = cdf_ctime(&ts.tv_sec); + c = cdf_ctime(&sec); if ((ec = strchr(c, '\n')) != NULL) *ec = '\0'; diff --git a/ext/fileinfo/tests/finfo_file_002.phpt b/ext/fileinfo/tests/finfo_file_002.phpt index 3593233..c3f8388 100644 --- a/ext/fileinfo/tests/finfo_file_002.phpt +++ b/ext/fileinfo/tests/finfo_file_002.phpt @@ -18,7 +18,7 @@ ksort($results); var_dump($results); ?> --EXPECTF-- -array(7) { +array(8) { ["%s/resources/dir.zip"]=> string(15) "application/zip" ["%s/resources/test.awk"]=> @@ -33,4 +33,6 @@ array(7) { string(15) "application/pdf" ["%s/resources/test.png"]=> string(9) "image/png" + ["%s/resources/test.ppt"]=> + string(29) "application/vnd.ms-powerpoint" } diff --git a/ext/fileinfo/tests/resources/test.ppt b/ext/fileinfo/tests/resources/test.ppt new file mode 100644 index 0000000..713004c Binary files /dev/null and b/ext/fileinfo/tests/resources/test.ppt differ