From 0d9704fa7b2f059be96cb1942fe81aef8e659f14 Mon Sep 17 00:00:00 2001 From: Edin Kadribasic Date: Mon, 9 Dec 2002 11:29:31 +0000 Subject: [PATCH] Fixed crash in socket_read on windows #20894 (patch by Wez Furlong). --- ext/sockets/sockets.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index 451b5badcc..dcc3900a72 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -766,30 +766,28 @@ PHP_FUNCTION(socket_write) } /* }}} */ -typedef int (*read_func)(int, void *, size_t, int); - /* {{{ proto string socket_read(resource socket, int length [, int type]) Reads a maximum of length bytes from socket */ PHP_FUNCTION(socket_read) { zval *arg1; php_socket *php_sock; - read_func read_function = (read_func) recv; char *tmpbuf; int retval, length, type = PHP_BINARY_READ; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|l", &arg1, &length, &type) == FAILURE) return; + tmpbuf = emalloc(length + 1); + ZEND_FETCH_RESOURCE(php_sock, php_socket *, &arg1, -1, le_socket_name, le_socket); if (type == PHP_NORMAL_READ) { - read_function = (read_func) php_read; + retval = php_read(php_sock->bsd_socket, tmpbuf, length, 0); + } else { + retval = recv(php_sock->bsd_socket, tmpbuf, length, 0); } - tmpbuf = emalloc(length + 1); - - retval = (*read_function)(php_sock->bsd_socket, tmpbuf, length, 0); if (retval == -1) { PHP_SOCKET_ERROR(php_sock, "unable to read from socket", errno); efree(tmpbuf); -- 2.50.1