diff options
| author | Thomas Punt <tpunt@php.net> | 2018-01-29 11:13:22 +0000 |
|---|---|---|
| committer | Thomas Punt <tpunt@php.net> | 2018-01-29 11:13:22 +0000 |
| commit | 0f393a61024d20c1edf3867824e6134ae9945170 (patch) | |
| tree | 781bf370d1fc35caff809b66ba6ac6a011a212d5 | |
| parent | fa586cee3ec4aa646b524737e1199fe9789c067d (diff) | |
| parent | fb128f6512dce083b35a26121a1d685caba16f2e (diff) | |
| download | php-git-0f393a61024d20c1edf3867824e6134ae9945170.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Use the correct freeing function
| -rw-r--r-- | ext/sockets/sockets.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index e2ba712672..c3f1f92c3c 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -1681,7 +1681,7 @@ PHP_FUNCTION(socket_recv) recv_buf = zend_string_alloc(len, 0); 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_NULL(buf); @@ -1823,7 +1823,7 @@ PHP_FUNCTION(socket_recvfrom) sin6.sin6_family = AF_INET6; if (arg6 == NULL) { - efree(recv_buf); + zend_string_free(recv_buf); WRONG_PARAM_COUNT; } |