archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3'

Browse source 
* 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
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
main/network.c
View file

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