1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

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 b7c5813c
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 GH-13795
Closes GH-13940
This commit is contained in:
Michael Orlitzky
2024-04-10 18:25:20 -04:00
committed by Niels Dossche
parent e2e4e64a20
commit 4ded247675
2 changed files with 12 additions and 8 deletions

4
NEWS
View File

@@ -12,6 +12,10 @@ PHP NEWS
. Fixed bug GH-13903 (ASAN false positive underflow when executing copy()).
(nielsdos)
- Fileinfo:
. Fixed bug GH-13795 (Test failing in ext/fileinfo/tests/bug78987.phpt on
big-endian PPC). (orlitzky)
- FPM:
. Fixed bug GH-13563 (Setting bool values via env in FPM config fails).
(Jakub Zelenka)

View File

@@ -11,14 +11,14 @@ $minSize = 128 * 1024;
$maxSize = 16 * 1024 * 1024;
$map = array(
131072 => 10055680,
262144 => 10055680,
524288 => 11898880,
1048576 => 12152832,
2097152 => 14254080,
4194304 => 18452480,
8388608 => 24743936,
16777216 => 37326848,
131072 => 10612736,
262144 => 10612736,
524288 => 12189696,
1048576 => 12709888,
2097152 => 14811136,
4194304 => 19009536,
8388608 => 25300992,
16777216 => 37883904,
);
for($size = $minSize; $size <= $maxSize; $size *= 2) {
$content = str_repeat('0', $size);