[packages/php/PHP_7_3] delayed-oom patch: accept hard limit message in single huge allocation tests
arekm
arekm at pld-linux.org
Thu Oct 22 15:09:11 CEST 2026
commit 3ef5f4a1755e27d09b793cb48859ace89640ac3d
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu Oct 22 15:08:53 2026 +0200
delayed-oom patch: accept hard limit message in single huge allocation tests
php-cve-2026-109618-delayed-oom.patch | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
---
diff --git a/php-cve-2026-109618-delayed-oom.patch b/php-cve-2026-109618-delayed-oom.patch
index 3e3ad71..14539b6 100644
--- a/php-cve-2026-109618-delayed-oom.patch
+++ b/php-cve-2026-109618-delayed-oom.patch
@@ -599,6 +599,26 @@ index 3a91bbc0..98e58686 100644
return 0;
}
/* }}} */
+diff --git a/ext/standard/tests/streams/bug61115-1.phpt b/ext/standard/tests/streams/bug61115-1.phpt
+index 892b0f80..ffca6f3c 100644
+--- a/ext/standard/tests/streams/bug61115-1.phpt
++++ b/ext/standard/tests/streams/bug61115-1.phpt
+@@ -14,4 +14,4 @@ stream_context_get_options($fileResourceTemp);
+ ftruncate($fileResourceTemp, PHP_INT_MAX);
+ ?>
+ --EXPECTF--
+-Fatal error: Allowed memory size of %d bytes exhausted%s(tried to allocate %d bytes) in %s on line %d
++Fatal error: %rHard memory limit|Allowed memory size%r of %d bytes exhausted%s(tried to allocate %d bytes) in %s on line %d
+diff --git a/ext/standard/tests/strings/wordwrap_memory_limit.phpt b/ext/standard/tests/strings/wordwrap_memory_limit.phpt
+index 21340153..8877a6c8 100644
+--- a/ext/standard/tests/strings/wordwrap_memory_limit.phpt
++++ b/ext/standard/tests/strings/wordwrap_memory_limit.phpt
+@@ -16,4 +16,4 @@ wordwrap($str, 1, $str2);
+
+ ?>
+ --EXPECTF--
+-Fatal error: Allowed memory size of 134217728 bytes exhausted%s(tried to allocate %d bytes) in %s on line %d
++Fatal error: %rHard memory limit|Allowed memory size%r of %d bytes exhausted%s(tried to allocate %d bytes) in %s on line %d
diff --git a/main/SAPI.c b/main/SAPI.c
index 068c06a8..b8be5424 100644
--- a/main/SAPI.c
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/3ef5f4a1755e27d09b793cb48859ace89640ac3d
More information about the pld-cvs-commit
mailing list