pollita Mon Sep 11 19:18:07 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main network.c
Log:
MFH: Bug #38687 - sockaddr local storage insufficient for all sock families
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.118.2.2.2.1&r2=1.118.2.2.2.2&diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.118.2.2.2.1
php-src/main/network.c:1.118.2.2.2.2
--- php-src/main/network.c:1.118.2.2.2.1 Sat Jul 1 11:35:34 2006
+++ php-src/main/network.c Mon Sep 11 19:18:07 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: network.c,v 1.118.2.2.2.1 2006/07/01 11:35:34 nlopess Exp $ */
+/* $Id: network.c,v 1.118.2.2.2.2 2006/09/11 19:18:07 pollita Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -787,37 +787,46 @@
/* make a connection attempt */
if (bindto) {
- struct sockaddr local_address;
+ struct sockaddr *local_address = NULL;
+ int local_address_len = 0;
if (sa->sa_family == AF_INET) {
- struct sockaddr_in *in4 = (struct
sockaddr_in*)&local_address;
+ struct sockaddr_in *in4 =
emalloc(sizeof(struct sockaddr_in));
+
+ local_address = (struct sockaddr*)in4;
+ local_address_len = sizeof(struct
sockaddr_in);
in4->sin_family = sa->sa_family;
in4->sin_port = htons(bindport);
if (!inet_aton(bindto, &in4->sin_addr))
{
- goto bad_ip;
+ php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Invalid IP Address: %s", bindto);
+ goto skip_bind;
}
memset(&(in4->sin_zero), 0,
sizeof(in4->sin_zero));
}
#if HAVE_IPV6 && HAVE_INET_PTON
else { /* IPV6 */
- struct sockaddr_in6 *in6 = (struct
sockaddr_in6*)&local_address;
+ struct sockaddr_in6 *in6 =
emalloc(sizeof(struct sockaddr_in6));
+
+ local_address = (struct sockaddr*)in6;
+ local_address_len = sizeof(struct
sockaddr_in6);
in6->sin6_family = sa->sa_family;
in6->sin6_port = htons(bindport);
if (inet_pton(AF_INET6, bindto,
&in6->sin6_addr) < 1) {
- goto bad_ip;
+ php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Invalid IP Address: %s", bindto);
+ goto skip_bind;
}
}
#endif
- if (bind(sock, &local_address, sizeof(struct
sockaddr))) {
+ if (!local_address || bind(sock, local_address,
local_address_len)) {
php_error_docref(NULL TSRMLS_CC,
E_WARNING, "failed to bind to '%s:%d', system said: %s", bindto, bindport,
strerror(errno));
}
- goto bind_done;
-bad_ip:
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Invalid IP Address: %s", bindto);
+skip_bind:
+ if (local_address) {
+ efree(local_address);
+ }
}
-bind_done:
/* free error string recieved during previous iteration
(if any) */
if (error_string && *error_string) {
efree(*error_string);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
