mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-18 14:30:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.2'

Browse Source 
* PHP-7.2:
  Fix potential memory leaks in sockets extension
This commit is contained in:
Thomas Punt 2018-04-28 13:58:45 +01:00
commit 74ecbbebe5
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ext/sockets/sockets.c
View File

@ -1288,11 +1288,11 @@ PHP_FUNCTION(socket_getsockname)
case AF_INET6: case AF_INET6:
sin6 = (struct sockaddr_in6 *) sa; sin6 = (struct sockaddr_in6 *) sa;
inet_ntop(AF_INET6, &sin6->sin6_addr, addr6, INET6_ADDRSTRLEN); inet_ntop(AF_INET6, &sin6->sin6_addr, addr6, INET6_ADDRSTRLEN);
zval_dtor(addr); zval_ptr_dtor(addr);
ZVAL_STRING(addr, addr6); ZVAL_STRING(addr, addr6);
if (port != NULL) { if (port != NULL) {
zval_dtor(port); zval_ptr_dtor(port);
ZVAL_LONG(port, htons(sin6->sin6_port)); ZVAL_LONG(port, htons(sin6->sin6_port));
} }
RETURN_TRUE; RETURN_TRUE;
@ -1305,11 +1305,11 @@ PHP_FUNCTION(socket_getsockname)
addr_string = inet_ntoa(sin->sin_addr); addr_string = inet_ntoa(sin->sin_addr);
inet_ntoa_lock = 0; inet_ntoa_lock = 0;
zval_dtor(addr); zval_ptr_dtor(addr);
ZVAL_STRING(addr, addr_string); ZVAL_STRING(addr, addr_string);
if (port != NULL) { if (port != NULL) {
zval_dtor(port); zval_ptr_dtor(port);
ZVAL_LONG(port, htons(sin->sin_port)); ZVAL_LONG(port, htons(sin->sin_port));
} }
RETURN_TRUE; RETURN_TRUE;
@ -1318,7 +1318,7 @@ PHP_FUNCTION(socket_getsockname)
case AF_UNIX: case AF_UNIX:
s_un = (struct sockaddr_un *) sa; s_un = (struct sockaddr_un *) sa;
zval_dtor(addr); zval_ptr_dtor(addr);
ZVAL_STRING(addr, s_un->sun_path); ZVAL_STRING(addr, s_un->sun_path);
RETURN_TRUE; RETURN_TRUE;
break; break;
@ -1367,11 +1367,11 @@ PHP_FUNCTION(socket_getpeername)
case AF_INET6: case AF_INET6:
sin6 = (struct sockaddr_in6 *) sa; sin6 = (struct sockaddr_in6 *) sa;
inet_ntop(AF_INET6, &sin6->sin6_addr, addr6, INET6_ADDRSTRLEN); inet_ntop(AF_INET6, &sin6->sin6_addr, addr6, INET6_ADDRSTRLEN);
zval_dtor(arg2); zval_ptr_dtor(arg2);
ZVAL_STRING(arg2, addr6); ZVAL_STRING(arg2, addr6);
if (arg3 != NULL) { if (arg3 != NULL) {
zval_dtor(arg3); zval_ptr_dtor(arg3);
ZVAL_LONG(arg3, htons(sin6->sin6_port)); ZVAL_LONG(arg3, htons(sin6->sin6_port));
} }
@ -1385,11 +1385,11 @@ PHP_FUNCTION(socket_getpeername)
addr_string = inet_ntoa(sin->sin_addr); addr_string = inet_ntoa(sin->sin_addr);
inet_ntoa_lock = 0; inet_ntoa_lock = 0;
zval_dtor(arg2); zval_ptr_dtor(arg2);
ZVAL_STRING(arg2, addr_string); ZVAL_STRING(arg2, addr_string);
if (arg3 != NULL) { if (arg3 != NULL) {
zval_dtor(arg3); zval_ptr_dtor(arg3);
ZVAL_LONG(arg3, htons(sin->sin_port)); ZVAL_LONG(arg3, htons(sin->sin_port));
} }
@ -1399,7 +1399,7 @@ PHP_FUNCTION(socket_getpeername)
case AF_UNIX: case AF_UNIX:
s_un = (struct sockaddr_un *) sa; s_un = (struct sockaddr_un *) sa;
zval_dtor(arg2); zval_ptr_dtor(arg2);
ZVAL_STRING(arg2, s_un->sun_path); ZVAL_STRING(arg2, s_un->sun_path);
RETURN_TRUE; RETURN_TRUE;
break; break;
@ -1672,14 +1672,14 @@ PHP_FUNCTION(socket_recv)
if ((retval = recv(php_sock->bsd_socket, ZSTR_VAL(recv_buf), len, flags)) < 1) { if ((retval = recv(php_sock->bsd_socket, ZSTR_VAL(recv_buf), len, flags)) < 1) {
zend_string_free(recv_buf); zend_string_free(recv_buf);
zval_dtor(buf); zval_ptr_dtor(buf);
ZVAL_NULL(buf); ZVAL_NULL(buf);
} else { } else {
ZSTR_LEN(recv_buf) = retval; ZSTR_LEN(recv_buf) = retval;
ZSTR_VAL(recv_buf)[ZSTR_LEN(recv_buf)] = '\0'; ZSTR_VAL(recv_buf)[ZSTR_LEN(recv_buf)] = '\0';
/* Rebuild buffer zval */ /* Rebuild buffer zval */
zval_dtor(buf); zval_ptr_dtor(buf);
ZVAL_NEW_STR(buf, recv_buf); ZVAL_NEW_STR(buf, recv_buf);
} }
@ -1768,8 +1768,8 @@ PHP_FUNCTION(socket_recvfrom)
ZSTR_LEN(recv_buf) = retval; ZSTR_LEN(recv_buf) = retval;
ZSTR_VAL(recv_buf)[ZSTR_LEN(recv_buf)] = '\0'; ZSTR_VAL(recv_buf)[ZSTR_LEN(recv_buf)] = '\0';
zval_dtor(arg2); zval_ptr_dtor(arg2);
zval_dtor(arg5); zval_ptr_dtor(arg5);
ZVAL_NEW_STR(arg2, recv_buf); ZVAL_NEW_STR(arg2, recv_buf);
ZVAL_STRING(arg5, s_un.sun_path); ZVAL_STRING(arg5, s_un.sun_path);
@ -1795,9 +1795,9 @@ PHP_FUNCTION(socket_recvfrom)
ZSTR_LEN(recv_buf) = retval; ZSTR_LEN(recv_buf) = retval;
ZSTR_VAL(recv_buf)[ZSTR_LEN(recv_buf)] = '\0'; ZSTR_VAL(recv_buf)[ZSTR_LEN(recv_buf)] = '\0';
zval_dtor(arg2); zval_ptr_dtor(arg2);
zval_dtor(arg5); zval_ptr_dtor(arg5);
zval_dtor(arg6); zval_ptr_dtor(arg6);
address = inet_ntoa(sin.sin_addr); address = inet_ntoa(sin.sin_addr);
@ -1826,9 +1826,9 @@ PHP_FUNCTION(socket_recvfrom)
ZSTR_LEN(recv_buf) = retval; ZSTR_LEN(recv_buf) = retval;
ZSTR_VAL(recv_buf)[ZSTR_LEN(recv_buf)] = '\0'; ZSTR_VAL(recv_buf)[ZSTR_LEN(recv_buf)] = '\0';
zval_dtor(arg2); zval_ptr_dtor(arg2);
zval_dtor(arg5); zval_ptr_dtor(arg5);
zval_dtor(arg6); zval_ptr_dtor(arg6);
memset(addr6, 0, INET6_ADDRSTRLEN); memset(addr6, 0, INET6_ADDRSTRLEN);
inet_ntop(AF_INET6, &sin6.sin6_addr, addr6, INET6_ADDRSTRLEN); inet_ntop(AF_INET6, &sin6.sin6_addr, addr6, INET6_ADDRSTRLEN);
@ -2221,7 +2221,7 @@ PHP_FUNCTION(socket_create_pair)
RETURN_FALSE; RETURN_FALSE;
} }
zval_dtor(fds_array_zval); zval_ptr_dtor(fds_array_zval);
array_init(fds_array_zval); array_init(fds_array_zval);
php_sock[0]->bsd_socket = fds_array[0]; php_sock[0]->bsd_socket = fds_array[0];