Commit 11721478558 for php.net

commit 117214785589729d468b56dfde4c678f25e2c68b
Merge: 3e7710c97d5 c1c3bcc46b9
Author: Niels Dossche <7771979+ndossche@users.noreply.github.com>
Date:   Sat Dec 13 11:59:13 2025 +0100

    Merge branch 'PHP-8.4' into PHP-8.5

    * PHP-8.4:
      standard: Fix error check for proc_open() command

diff --cc NEWS
index 1833ce6f9ca,76ce9021b7c..3d3e304b648
--- a/NEWS
+++ b/NEWS
@@@ -13,11 -16,10 +13,14 @@@ PH
  - LDAP:
    . Fix memory leak in ldap_set_options(). (ndossche)

 +- Lexbor:
 +  . Fixed bug GH-20668 (\Uri\WhatWg\Url::withHost() crashes (SEGV) for URLs
 +    using the file: scheme). (lexborisov)
 +
+ - Standard:
+   . Fix error check for proc_open() command. (ndossche)
 -
 -18 Dec 2025, PHP 8.4.16
++
 +18 Dec 2025, PHP 8.5.1

  - Core:
    . Sync all boost.context files with release 1.86.0. (mvorisek)
diff --cc ext/standard/proc_open.c
index 690e23e0d35,278f7486e1a..d489696dd48
--- a/ext/standard/proc_open.c
+++ b/ext/standard/proc_open.c
@@@ -502,8 -506,8 +502,8 @@@ typedef struct _descriptorspec_item
  	int mode_flags;                  /* mode for opening FDs: r/o, r/w, binary (on Win32), etc */
  } descriptorspec_item;

 -static zend_string *get_valid_arg_string(zval *zv, int elem_num) {
 +static zend_string *get_valid_arg_string(zval *zv, uint32_t elem_num) {
- 	zend_string *str = zval_get_string(zv);
+ 	zend_string *str = zval_try_get_string(zv);
  	if (!str) {
  		return NULL;
  	}