Skip to content

Commit ba534e7

Browse files
committed
Merge branch 'PHP-8.3'
* PHP-8.3: Fix undefined behaviour in fastcgi.c (php#14269)
2 parents 8de9295 + 6bb6ff2 commit ba534e7

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

main/fastcgi.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ int fcgi_listen(const char *path, int backlog)
737737
memset(&sa.sa_unix, 0, sizeof(sa.sa_unix));
738738
sa.sa_unix.sun_family = AF_UNIX;
739739
memcpy(sa.sa_unix.sun_path, path, path_len + 1);
740-
sock_len = (size_t)(((struct sockaddr_un *)0)->sun_path) + path_len;
740+
sock_len = XtOffsetOf(struct sockaddr_un, sun_path) + path_len;
741741
#ifdef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN
742742
sa.sa_unix.sun_len = sock_len;
743743
#endif

0 commit comments

Comments
 (0)