Merge branch 'PHP-8.3' into PHP-8.4

ndossche · ndossche · commit c1c3bcc46b9a · 2025-12-13T11:58:25.000+01:00
* PHP-8.3:
  standard: Fix error check for proc_open() command
diff --git a/NEWS b/NEWS
@@ -15,6 +15,9 @@ PHP                                                                        NEWS
 
 - LDAP:
   . Fix memory leak in ldap_set_options(). (ndossche)
+
+- Standard:
+  . Fix error check for proc_open() command. (ndossche)
  
 18 Dec 2025, PHP 8.4.16
 
diff --git a/ext/standard/proc_open.c b/ext/standard/proc_open.c
@@ -507,7 +507,7 @@ typedef struct _descriptorspec_item {
 } descriptorspec_item;
 
 static zend_string *get_valid_arg_string(zval *zv, int 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
`@@ -507,7 +507,7 @@ typedef struct _descriptorspec_item {`
`507`	`507`	`} descriptorspec_item;`
`508`	`508`
`509`	`509`	`static zend_string get_valid_arg_string(zval zv, int elem_num) {`
`510`		`- zend_string *str = zval_get_string(zv);`
	`510`	`+ zend_string *str = zval_try_get_string(zv);`
`511`	`511`	`if (!str) {`
`512`	`512`	`return NULL;`
`513`	`513`	`}`