Merge branch 'PHP-8.3' into PHP-8.4

ndossche · ndossche · commit ad129c6f970a · 2025-09-04T23:13:45.000+02:00
* PHP-8.3:
  Remove incorrect call to zval_ptr_dtor() in user_wrapper_metadata()
diff --git a/NEWS b/NEWS
@@ -39,6 +39,10 @@ PHP                                                                        NEWS
 - Standard:
   . Fixed bug GH-16649 (UAF during array_splice). (alexandre-daubois)
 
+- Streams:
+  . Remove incorrect call to zval_ptr_dtor() in user_wrapper_metadata().
+    (nielsdos)
+
 28 Aug 2025, PHP 8.4.12
 
 - Core:
diff --git a/main/streams/userspace.c b/main/streams/userspace.c
@@ -1222,7 +1222,6 @@ static int user_wrapper_metadata(php_stream_wrapper *wrapper, const char *url, i
 			break;
 		default:
 			php_error_docref(NULL, E_WARNING, "Unknown option %d for " USERSTREAM_METADATA, option);
-			zval_ptr_dtor(&args[2]);
 			return ret;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1222,7 +1222,6 @@ static int user_wrapper_metadata(php_stream_wrapper wrapper, const char url, i`
`1222`	`1222`	`break;`
`1223`	`1223`	`default:`
`1224`	`1224`	`php_error_docref(NULL, E_WARNING, "Unknown option %d for " USERSTREAM_METADATA, option);`
`1225`		`- zval_ptr_dtor(&args[2]);`
`1226`	`1225`	`return ret;`
`1227`	`1226`	`}`
`1228`	`1227`