Browse Source

Fixed bug #66307 Fileinfo crashes with powerpoint files

pull/695/head
Anatol Belski 12 years ago
committed by Stanislav Malyshev
parent
commit
15ee33eb21
  1. 5
      ext/fileinfo/libmagic/readcdf.c
  2. 4
      ext/fileinfo/tests/finfo_file_002.phpt
  3. BIN
      ext/fileinfo/tests/resources/test.ppt

5
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';

4
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"
}

BIN
ext/fileinfo/tests/resources/test.ppt

Loading…
Cancel
Save