diff options
| author | Anatol Belski <ab@php.net> | 2014-04-24 19:30:34 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-04-24 19:30:34 +0200 |
| commit | 03fa5501a84af2bda7d81c732d46d2a68ee0e855 (patch) | |
| tree | 29f775bc343dc2f7d08fee7d9ce5a501d8b58fb2 | |
| parent | acfed1c4c71f25603e90f9df3930c294e5ae0726 (diff) | |
| download | php-git-03fa5501a84af2bda7d81c732d46d2a68ee0e855.tar.gz | |
Fixed bug #66307 Fileinfo crashes with powerpoint files
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/fileinfo/libmagic/readcdf.c | 5 | ||||
| -rw-r--r-- | ext/fileinfo/tests/finfo_file_002.phpt | 4 | ||||
| -rw-r--r-- | ext/fileinfo/tests/resources/test.ppt | bin | 0 -> 99840 bytes |
4 files changed, 10 insertions, 2 deletions
@@ -14,6 +14,9 @@ PHP NEWS . Fixed bug #67081 (DOMDocumentType->internalSubset returns entire DOCTYPE tag, not only the subset). (Anatol) +- Fileinfo: + . Fixed bug #66307 (Fileinfo crashes with powerpoint files). (Anatol) + - FPM: . Fixed bug #66908 (php-fpm reload leaks epoll_create() file descriptor). (Julio Pintos) diff --git a/ext/fileinfo/libmagic/readcdf.c b/ext/fileinfo/libmagic/readcdf.c index 3abcc2e62e..ade10b2bf7 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, tbuf); + c = cdf_ctime(&sec, tbuf); 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 feb4010f74..5cce7f3f9b 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(8) { +array(9) { ["%s/resources/dir.zip"]=> string(15) "application/zip" ["%s/resources/test.awk"]=> @@ -35,4 +35,6 @@ array(8) { 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 Binary files differnew file mode 100644 index 0000000000..713004c03d --- /dev/null +++ b/ext/fileinfo/tests/resources/test.ppt |