Merge branch 'PHP-8.5'

ndossche · ndossche · commit 0375697dab4f · 2026-02-15T23:28:51.000+01:00
* PHP-8.5:
  Fix merge for ext/sockets
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
@@ -1726,7 +1726,7 @@ PHP_FUNCTION(socket_sendto)
 		case AF_UNIX:
 			memset(&s_un, 0, sizeof(s_un));
 
-			if (addr_len >= sizeof(s_un.sun_path)) {
+			if (ZSTR_LEN(addr) >= sizeof(s_un.sun_path)) {
 				zend_argument_value_error(5, "must be less than %d", sizeof(s_un.sun_path));
 				RETURN_THROWS();
 			}

Original file line number	Diff line number	Diff line change
`@@ -1726,7 +1726,7 @@ PHP_FUNCTION(socket_sendto)`
`1726`	`1726`	`case AF_UNIX:`
`1727`	`1727`	`memset(&s_un, 0, sizeof(s_un));`
`1728`	`1728`
`1729`		`- if (addr_len >= sizeof(s_un.sun_path)) {`
	`1729`	`+ if (ZSTR_LEN(addr) >= sizeof(s_un.sun_path)) {`
`1730`	`1730`	`zend_argument_value_error(5, "must be less than %d", sizeof(s_un.sun_path));`
`1731`	`1731`	`RETURN_THROWS();`
`1732`	`1732`	`}`