]> granicus.if.org Git - php/commitdiff
MFB
authorAndrei Zmievski <andrei@php.net>
Thu, 4 Jun 2009 18:17:43 +0000 (18:17 +0000)
committerAndrei Zmievski <andrei@php.net>
Thu, 4 Jun 2009 18:17:43 +0000 (18:17 +0000)
ext/sockets/sockets.c

index 81a3f31f050ef2c4824891a1817dace6e47b6e61..abc6438e9f74afa9a5beec2df1993c9ddd56be73 100644 (file)
@@ -1611,10 +1611,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