Skip to content

Commit 0fb1238

Browse files
committed
Merge branch 'PHP-8.3'
* PHP-8.3: 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
2 parents 279d82b + 7ee7492 commit 0fb1238

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ext/standard/tests/strings/wordwrap_memory_limit.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
No overflow should occur during the memory_limit check for wordwrap()
33
--SKIPIF--
44
<?php
5-
if (substr(PHP_OS, 0, 3) == 'WIN' && PHP_INT_SIZE == 4) die("skip this test is not for 32bit Windows platforms");
5+
if (PHP_INT_SIZE == 4) die("skip this test is not for 32bit platforms");
66
if (getenv("USE_ZEND_ALLOC") === "0") die("skip Zend MM disabled");
77
?>
88
--INI--

ext/standard/tests/strings/wordwrap_memory_limit_win32.phpt renamed to ext/standard/tests/strings/wordwrap_memory_limit_32bit.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
No overflow should occur during the memory_limit check for wordwrap()
33
--SKIPIF--
44
<?php
5-
if (substr(PHP_OS, 0, 3) != 'WIN' || PHP_INT_SIZE != 4) die("skip this test is for 32bit Windows platforms only");
5+
if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platforms only");
66
if (getenv("USE_ZEND_ALLOC") === "0") die("skip Zend MM disabled");
77
?>
88
--INI--
@@ -16,4 +16,4 @@ wordwrap($str, 1, $str2);
1616

1717
?>
1818
--EXPECTF--
19-
Fatal error: Possible integer overflow in memory allocation (4294901777 + %d) in %s on line %d
19+
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

0 commit comments

Comments
 (0)