From: Gustavo Lopes <glopes@nebm.ist.utl.pt>
Date: Fri, 2 Nov 2012 16:52:13 +0000 (+0100)
Subject: Fix bug converting zval sockaddr
X-Git-Tag: php-5.5.0alpha5~43^2~11^2~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b06f00477ce4f20516c6f727797f208ffaefcae9;p=php

Fix bug converting zval sockaddr

The bug ocurred when the family was not specified but was instead guessed.
---

diff --git a/ext/sockets/sendrecvmsg.c b/ext/sockets/sendrecvmsg.c
index 379af125d7..837ae23735 100644
--- a/ext/sockets/sendrecvmsg.c
+++ b/ext/sockets/sendrecvmsg.c
@@ -627,6 +627,7 @@ static void from_zval_write_sockaddr_aux(const zval *container,
 		*sockaddr_len = sizeof(struct sockaddr_in);
 		if (fill_sockaddr) {
 			from_zval_write_sockaddr_in(container, (char*)*sockaddr_ptr, ctx);
+			(*sockaddr_ptr)->sa_family = AF_INET;
 		}
 		break;
 	case AF_INET6:
@@ -639,6 +640,7 @@ static void from_zval_write_sockaddr_aux(const zval *container,
 		*sockaddr_len = sizeof(struct sockaddr_in6);
 		if (fill_sockaddr) {
 			from_zval_write_sockaddr_in6(container, (char*)*sockaddr_ptr, ctx);
+			(*sockaddr_ptr)->sa_family = AF_INET6;
 		}
 		break;
 	default: