MFH: initialize memory

arnaud-lb · arnaud-lb · commit 43400aaf879c · 2008-11-04T20:40:30.000Z
diff --git a/main/network.c b/main/network.c
@@ -647,6 +647,7 @@ PHPAPI int php_network_get_peer_name(php_socket_t sock,
 {
 	php_sockaddr_storage sa;
 	socklen_t sl = sizeof(sa);
+	memset(&sa, 0, sizeof(sa));
 	
 	if (getpeername(sock, (struct sockaddr*)&sa, &sl) == 0) {
 		php_network_populate_name_from_sockaddr((struct sockaddr*)&sa, sl,
@@ -666,6 +667,7 @@ PHPAPI int php_network_get_sock_name(php_socket_t sock,
 {
 	php_sockaddr_storage sa;
 	socklen_t sl = sizeof(sa);
+	memset(&sa, 0, sizeof(sa));
 	
 	if (getsockname(sock, (struct sockaddr*)&sa, &sl) == 0) {
 		php_network_populate_name_from_sockaddr((struct sockaddr*)&sa, sl,

Original file line number	Diff line number	Diff line change
`@@ -647,6 +647,7 @@ PHPAPI int php_network_get_peer_name(php_socket_t sock,`
`647`	`647`	`{`
`648`	`648`	`php_sockaddr_storage sa;`
`649`	`649`	`socklen_t sl = sizeof(sa);`
	`650`	`+ memset(&sa, 0, sizeof(sa));`
`650`	`651`
`651`	`652`	`if (getpeername(sock, (struct sockaddr*)&sa, &sl) == 0) {`
`652`	`653`	`php_network_populate_name_from_sockaddr((struct sockaddr*)&sa, sl,`
`@@ -666,6 +667,7 @@ PHPAPI int php_network_get_sock_name(php_socket_t sock,`
`666`	`667`	`{`
`667`	`668`	`php_sockaddr_storage sa;`
`668`	`669`	`socklen_t sl = sizeof(sa);`
	`670`	`+ memset(&sa, 0, sizeof(sa));`
`669`	`671`
`670`	`672`	`if (getsockname(sock, (struct sockaddr*)&sa, &sl) == 0) {`
`671`	`673`	`php_network_populate_name_from_sockaddr((struct sockaddr*)&sa, sl,`