Skip to content

Commit 4ded247

Browse files
orlitzkynielsdos
authored andcommitted
ext/fileinfo/tests/bug78987.phpt: increase a memory limit
This test performs a few checks to ensure that "not too much" memory is used while fileinfo is detecting encodings. It is however platform specific, and memory usage varies across hosts and as libmagic changes. Recently a Gentoo user reported a failure in this test at, https://bugs.gentoo.org/927461 on a big-endian PPC64 machine with output, ---- EXPECTED OUTPUT 131072 => ok 262144 => ok 524288 => ok 1048576 => ok 2097152 => ok 4194304 => ok 8388608 => ok 16777216 => ok ---- ACTUAL OUTPUT 131072 => 10092544 262144 => 10092544 524288 => 12189696 1048576 => 12189696 2097152 => 14352384 4194304 => 18612224 8388608 => 24903680 16777216 => 37486592 ---- FAILED Those numbers are with 8.3.4 and therefore missing commit b7c5813 which also raises the limits. Checking the "actual" numbers above against the current values, we see that the limit for 524288 would need to be bumped to 12189696 to allow this test to pass. Since that seems reasonable, that's what this commit does. Closes phpGH-13795 Closes phpGH-13940
1 parent e2e4e64 commit 4ded247

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

NEWS

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ PHP NEWS
1212
. Fixed bug GH-13903 (ASAN false positive underflow when executing copy()).
1313
(nielsdos)
1414

15+
- Fileinfo:
16+
. Fixed bug GH-13795 (Test failing in ext/fileinfo/tests/bug78987.phpt on
17+
big-endian PPC). (orlitzky)
18+
1519
- FPM:
1620
. Fixed bug GH-13563 (Setting bool values via env in FPM config fails).
1721
(Jakub Zelenka)

ext/fileinfo/tests/bug78987.phpt

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ $minSize = 128 * 1024;
1111
$maxSize = 16 * 1024 * 1024;
1212

1313
$map = array(
14-
131072 => 10055680,
15-
262144 => 10055680,
16-
524288 => 11898880,
17-
1048576 => 12152832,
18-
2097152 => 14254080,
19-
4194304 => 18452480,
20-
8388608 => 24743936,
21-
16777216 => 37326848,
14+
131072 => 10612736,
15+
262144 => 10612736,
16+
524288 => 12189696,
17+
1048576 => 12709888,
18+
2097152 => 14811136,
19+
4194304 => 19009536,
20+
8388608 => 25300992,
21+
16777216 => 37883904,
2222
);
2323
for($size = $minSize; $size <= $maxSize; $size *= 2) {
2424
$content = str_repeat('0', $size);

0 commit comments

Comments
 (0)