Skip to content

Fix #79756: finfo_file crash (FILEINFO_MIME) #5778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix #79756: finfo_file crash (FILEINFO_MIME) #5778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1967fee
Fix #79756: finfo_file crash (FILEINFO_MIME)
cmb69 Jun 29, 2020
352f2c1
Handle asctime() returning NULL as well
cmb69 Jun 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions ext/fileinfo/tests/bug79756.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
--TEST--
Bug #79756 (finfo_file crash (FILEINFO_MIME))
--SKIPIF--
<?php
if (!extension_loaded('fileinfo')) die('skip fileinfo extension not available');
?>
--FILE--
<?php
$filename = __DIR__ . '/bug79756.xls';
$finfo = finfo_open(FILEINFO_MIME);
$mime = finfo_file($finfo, $filename);
finfo_close($finfo);
echo $mime;
?>
--EXPECT--
application/vnd.ms-excel; charset=binary
Binary file added ext/fileinfo/tests/bug79756.xls
View file
Open in desktop
Binary file not shown.
14 changes: 10 additions & 4 deletions main/reentrancy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,11 +187,14 @@ PHPAPI char *php_ctime_r(const time_t *clock, char *buf)
local_lock(CTIME_R);

tmp = ctime(clock);
strcpy(buf, tmp);
if (tmp) {
strcpy(buf, tmp);
tmp = buf;
}

local_unlock(CTIME_R);

return buf;
return tmp;
}

#endif
Expand All @@ -205,11 +208,14 @@ PHPAPI char *php_asctime_r(const struct tm *tm, char *buf)
local_lock(ASCTIME_R);

tmp = asctime(tm);
strcpy(buf, tmp);
if (tmp) {
strcpy(buf, tmp);
tmp = buf;
}

local_unlock(ASCTIME_R);

return buf;
return tmp;
}

#endif
Expand Down