Merge branch 'PHP-8.4' into PHP-8.5

ndossche · ndossche · commit 117214785589 · 2025-12-13T11:59:13.000+01:00
* PHP-8.4:
  standard: Fix error check for proc_open() command
diff --git a/NEWS b/NEWS
@@ -17,6 +17,9 @@ PHP                                                                        NEWS
   . 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.5.1
 
 - Core:
diff --git a/ext/standard/proc_open.c b/ext/standard/proc_open.c
@@ -503,7 +503,7 @@ typedef struct _descriptorspec_item {
 } descriptorspec_item;
 
 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;
 	}

Original file line number	Diff line number	Diff line change
`@@ -503,7 +503,7 @@ typedef struct _descriptorspec_item {`
`503`	`503`	`} descriptorspec_item;`
`504`	`504`
`505`	`505`	`static zend_string get_valid_arg_string(zval zv, uint32_t elem_num) {`
`506`		`- zend_string *str = zval_get_string(zv);`
	`506`	`+ zend_string *str = zval_try_get_string(zv);`
`507`	`507`	`if (!str) {`
`508`	`508`	`return NULL;`
`509`	`509`	`}`