mirror of
https://github.com/php/php-src.git
synced 2025-08-16 05:58:45 +02:00
Merge branch 'PHP-7.2'
* PHP-7.2: Use the correct freeing function
This commit is contained in:
commit
e51aadcc4e
1 changed files with 2 additions and 2 deletions
|
@ -1670,7 +1670,7 @@ PHP_FUNCTION(socket_recv)
|
||||||
recv_buf = zend_string_alloc(len, 0);
|
recv_buf = zend_string_alloc(len, 0);
|
||||||
|
|
||||||
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) {
|
||||||
efree(recv_buf);
|
zend_string_free(recv_buf);
|
||||||
|
|
||||||
zval_dtor(buf);
|
zval_dtor(buf);
|
||||||
ZVAL_NULL(buf);
|
ZVAL_NULL(buf);
|
||||||
|
@ -1812,7 +1812,7 @@ PHP_FUNCTION(socket_recvfrom)
|
||||||
sin6.sin6_family = AF_INET6;
|
sin6.sin6_family = AF_INET6;
|
||||||
|
|
||||||
if (arg6 == NULL) {
|
if (arg6 == NULL) {
|
||||||
efree(recv_buf);
|
zend_string_free(recv_buf);
|
||||||
WRONG_PARAM_COUNT;
|
WRONG_PARAM_COUNT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue