summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-04-15 15:00:49 +0200
committerNikita Popov <nikita.ppv@gmail.com>2019-04-15 15:00:49 +0200
commite05c6a25f96da19a8578076e5861934af85c8fc7 (patch)
tree11d6fddd9a4587bdf1d8f377b58651e567a8d6c0
parent56110587661e83e1e71cd1143209c16153ec20c6 (diff)
parent9b1950b00591e3a6de0f39e6c1a5708d37188224 (diff)
downloadphp-git-e05c6a25f96da19a8578076e5861934af85c8fc7.tar.gz
Merge branch 'PHP-7.2' into PHP-7.3
-rw-r--r--main/network.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/main/network.c b/main/network.c
index 7eccb36047..21f17e8ade 100644
--- a/main/network.c
+++ b/main/network.c
@@ -514,6 +514,8 @@ PHPAPI int php_network_parse_network_address_with_port(const char *addr, zend_lo
struct sockaddr_in6 *in6 = (struct sockaddr_in6*)sa;
#endif
+ memset(sa, 0, sizeof(struct sockaddr));
+
if (*addr == '[') {
colon = memchr(addr + 1, ']', addrlen-1);
if (!colon || colon[1] != ':') {