From: Andrei Zmievski <andrei@php.net>
Date: Thu, 4 Jun 2009 18:17:28 +0000 (+0000)
Subject: Fix invalid test against addr6 result.
X-Git-Tag: php-5.2.10RC2~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a05922020a4fdf07a4d408ef0cf83160a606b46;p=php

Fix invalid test against addr6 result.
---

diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index 7e4ffda02d..e8fdfb86d5 100644
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -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