Merge branch 'PHP-7.2' into PHP-7.3

This commit is contained in:
Nikita Popov 2019-04-15 15:00:49 +02:00
commit e05c6a25f9

View file

@ -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] != ':') {