Commit 40364dddee4 for php
commit 40364dddee4ce46d1f3a49facce2b8426c5543ba
Merge: 60ddc8fbf11 85703b71ba8
Author: David Carlier <devnexen@gmail.com>
Date: Sat Sep 26 18:26:08 2026 +0100
Merge branch 'PHP-8.5' into PHP-8.6
* PHP-8.5:
ext/pcntl: fix an off by one bound and a parameter the parser made required
# Conflicts:
# ext/pcntl/pcntl.c
diff --cc ext/pcntl/pcntl.c
index 38e6c4ae2bc,912e13ac48a..0646e7ba043
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
@@@ -1925,13 -1946,14 +1925,14 @@@ PHP_FUNCTION(pcntl_getqos_class
PHP_FUNCTION(pcntl_setqos_class)
{
- zend_enum_Pcntl_QosClass qos;
- zval *qos_obj = NULL;
++ zend_enum_Pcntl_QosClass qos = ZEND_ENUM_Pcntl_QosClass_Default;
- ZEND_PARSE_PARAMETERS_START(1, 1)
+ ZEND_PARSE_PARAMETERS_START(0, 1)
+ Z_PARAM_OPTIONAL
- Z_PARAM_OBJECT_OF_CLASS(qos_obj, QosClass_ce)
+ Z_PARAM_ENUM(qos, QosClass_ce)
ZEND_PARSE_PARAMETERS_END();
- qos_class_t qos_class = qos_obj ? qos_zval_to_lval(qos_obj) : QOS_CLASS_DEFAULT;
+ qos_class_t qos_class = qos_enum_to_pthread(qos);
if (UNEXPECTED(pthread_set_qos_class_self_np((qos_class_t)qos_class, 0) != 0))
{