archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.4'

Browse source 
* PHP-8.4:
  Fix cve-2014-3538 test
This commit is contained in:
Ilija Tovilo 2025-01-27 21:49:16 +01:00
commit 3992ffa2c2
No known key found for this signature in database
GPG key ID: 5050C66BFCD1015A
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/fileinfo/tests/cve-2014-3538-mb.phpt
View file

@ -30,7 +30,7 @@ if ($t < 3) {
Done Done
--CLEAN-- --CLEAN--
<?php <?php
@unlink(__DIR__.'/cve-2014-3538.data'); @unlink(__DIR__.'/cve-2014-3538私はガラスを食べられます.data');
?> ?>
--EXPECTF-- --EXPECTF--
string(%d) "%s" string(%d) "%s"

6
ext/fileinfo/tests/cve-2014-3538-nojit.phpt
View file

@ -13,7 +13,7 @@ if (getenv('SKIP_PERF_SENSITIVE'))
pcre.jit=0 pcre.jit=0
--FILE-- --FILE--
<?php <?php
$fd = __DIR__.'/cve-2014-3538.data'; $fd = __DIR__.'/cve-2014-3538-nojit.data';
file_put_contents($fd, file_put_contents($fd,
'try:' . 'try:' .
@ -24,7 +24,7 @@ $t = microtime(true);
var_dump(finfo_file($fi, $fd)); var_dump(finfo_file($fi, $fd));
$t = microtime(true) - $t; $t = microtime(true) - $t;
finfo_close($fi); finfo_close($fi);
if ($t < 1) { if ($t < 1.5) {
echo "Ok\n"; echo "Ok\n";
} else { } else {
printf("Failed, time=%.2f\n", $t); printf("Failed, time=%.2f\n", $t);
@ -34,7 +34,7 @@ if ($t < 1) {
Done Done
--CLEAN-- --CLEAN--
<?php <?php
@unlink(__DIR__.'/cve-2014-3538.data'); @unlink(__DIR__.'/cve-2014-3538-nojit.data');
?> ?>
--EXPECTF-- --EXPECTF--
string(%d) "%s" string(%d) "%s"