php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2' into PHP-8.3

Browse Source 
* PHP-8.2:
  NEWS for GH-14814
  ext/standard/tests: strings/wordwrap_memory_limit_32bit.phpt has two outputs
  ext/standard/tests: 32bit wordwrap tests aren't just for Windows
This commit is contained in:
Niels Dossche
2024-07-04 15:56:43 +02:00
parent 519c435fc6 1006e1021e
commit 7ee7492f30
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -38,6 +38,7 @@ PHP NEWS
- Standard:
. Fixed bug GH-14775 (range function overflow with negative step argument).
(David Carlier)
. Fix 32-bit wordwrap test failures. (orlitzky)
- Treewide:
. Fix compatibility with libxml2 2.13.2. (nielsdos)

2
ext/standard/tests/strings/wordwrap_memory_limit.phpt
View File

@@ -2,7 +2,7 @@
No overflow should occur during the memory_limit check for wordwrap()
--SKIPIF--
<?php
if (substr(PHP_OS, 0, 3) == 'WIN' && PHP_INT_SIZE == 4) die("skip this test is not for 32bit Windows platforms");
if (PHP_INT_SIZE == 4) die("skip this test is not for 32bit platforms");
if (getenv("USE_ZEND_ALLOC") === "0") die("skip Zend MM disabled");
?>
--INI--

4
ext/standard/tests/strings/wordwrap_memory_limit_win32.phpt → ext/standard/tests/strings/wordwrap_memory_limit_32bit.phpt
View File

@@ -2,7 +2,7 @@
No overflow should occur during the memory_limit check for wordwrap()
--SKIPIF--
<?php
if (substr(PHP_OS, 0, 3) != 'WIN' || PHP_INT_SIZE != 4) die("skip this test is for 32bit Windows platforms only");
if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platforms only");
if (getenv("USE_ZEND_ALLOC") === "0") die("skip Zend MM disabled");
?>
--INI--
@@ -16,4 +16,4 @@ wordwrap($str, 1, $str2);
?>
--EXPECTF--
Fatal error: Possible integer overflow in memory allocation (4294901777 + %d) in %s on line %d
Fatal error: %rAllowed memory size of %d bytes exhausted%s\(tried to allocate %d bytes\)|Possible integer overflow in memory allocation \(4294901777 \+ %d\)%r in %s on line %d