Merge branch 'PHP-8.3'

* PHP-8.3:
  Fix uninitialized memory in network.c
This commit is contained in:
Niels Dossche 2024-07-22 22:26:02 +02:00
commit 32fe9bc430
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5

View file

@ -842,7 +842,7 @@ php_socket_t php_network_connect_socket_to_host(const char *host, unsigned short
#ifdef HAVE_IPV6
struct sockaddr_in6 in6;
#endif
} local_address;
} local_address = {0};
int local_address_len = 0;
if (sa->sa_family == AF_INET) {
@ -850,7 +850,6 @@ php_socket_t php_network_connect_socket_to_host(const char *host, unsigned short
local_address_len = sizeof(struct sockaddr_in);
local_address.in4.sin_family = sa->sa_family;
local_address.in4.sin_port = htons(bindport);
memset(&(local_address.in4.sin_zero), 0, sizeof(local_address.in4.sin_zero));
}
}
#ifdef HAVE_IPV6