]> granicus.if.org Git - php/commitdiff
Fix invalid test against addr6 result.
authorAndrei Zmievski <andrei@php.net>
Thu, 4 Jun 2009 18:17:28 +0000 (18:17 +0000)
committerAndrei Zmievski <andrei@php.net>
Thu, 4 Jun 2009 18:17:28 +0000 (18:17 +0000)
ext/sockets/sockets.c

index 7e4ffda02d39d805d1d453895aa9847ba64c1396..e8fdfb86d54e4213d63ea0aa2eaaca9f2f334c00 100644 (file)
@@ -1466,10 +1466,11 @@ PHP_FUNCTION(socket_recvfrom)
                        zval_dtor(arg5);
                        zval_dtor(arg6);
 
+                       memset(addr6, 0, INET6_ADDRSTRLEN);
                        inet_ntop(AF_INET6, &sin6.sin6_addr, addr6, INET6_ADDRSTRLEN);
 
                        ZVAL_STRINGL(arg2, recv_buf, retval, 0);
-                       ZVAL_STRING(arg5, addr6 ? addr6 : "::", 1);
+                       ZVAL_STRING(arg5, addr6[0] ? addr6 : "::", 1);
                        ZVAL_LONG(arg6, ntohs(sin6.sin6_port));
                        break;
 #endif