From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Sat, 12 Oct 2019 15:50:14 +0000 (+0200)
Subject: Just return after exception has been thrown
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77bd1ce60d00568dab3bbcc2d1feeb6cb9c2be86;p=php

Just return after exception has been thrown
---

diff --git a/ext/sockets/sendrecvmsg.c b/ext/sockets/sendrecvmsg.c
index b5b6050809..6ceb4035b8 100644
--- a/ext/sockets/sendrecvmsg.c
+++ b/ext/sockets/sendrecvmsg.c
@@ -181,7 +181,7 @@ PHP_FUNCTION(socket_sendmsg)
 
 	if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(zsocket),
 					php_sockets_le_socket_name, php_sockets_le_socket())) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	msghdr = from_zval_run_conversions(zmsg, php_sock, from_zval_write_msghdr_send,
@@ -226,7 +226,7 @@ PHP_FUNCTION(socket_recvmsg)
 
 	if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(zsocket),
 					php_sockets_le_socket_name, php_sockets_le_socket())) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	msghdr = from_zval_run_conversions(zmsg, php_sock, from_zval_write_msghdr_recv,
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index ab1397f088..f786c8b50a 100644
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -846,7 +846,7 @@ PHP_FUNCTION(socket_accept)
 	}
 
 	if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	if (!php_accept_connect(php_sock, &new_sock, (struct sockaddr*)&sa, &php_sa_len)) {
@@ -869,7 +869,7 @@ PHP_FUNCTION(socket_set_nonblock)
 	}
 
 	if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	if (!Z_ISUNDEF(php_sock->zstream)) {
@@ -907,7 +907,7 @@ PHP_FUNCTION(socket_set_block)
 	}
 
 	if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	/* if socket was created from a stream, give the stream a chance to take
@@ -948,7 +948,7 @@ PHP_FUNCTION(socket_listen)
 	}
 
 	if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	if (listen(php_sock->bsd_socket, backlog) != 0) {
@@ -971,7 +971,7 @@ PHP_FUNCTION(socket_close)
 	}
 
 	if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	if (!Z_ISUNDEF(php_sock->zstream)) {
@@ -1010,7 +1010,7 @@ PHP_FUNCTION(socket_write)
 	}
 
 	if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	if (ZEND_NUM_ARGS() < 3) {
@@ -1054,7 +1054,7 @@ PHP_FUNCTION(socket_read)
 	tmpbuf = zend_string_alloc(length, 0);
 
 	if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	if (type == PHP_NORMAL_READ) {
@@ -1114,7 +1114,7 @@ PHP_FUNCTION(socket_getsockname)
 	}
 
 	if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	sa = (struct sockaddr *) &sa_storage;
@@ -1188,7 +1188,7 @@ PHP_FUNCTION(socket_getpeername)
 	}
 
 	if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	sa = (struct sockaddr *) &sa_storage;
@@ -1303,7 +1303,7 @@ PHP_FUNCTION(socket_connect)
 	}
 
 	if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	switch(php_sock->type) {
@@ -1409,7 +1409,7 @@ PHP_FUNCTION(socket_bind)
 	}
 
 	if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	switch(php_sock->type) {
@@ -1491,7 +1491,7 @@ PHP_FUNCTION(socket_recv)
 	}
 
 	if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(php_sock_res), le_socket_name, le_socket)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	/* overflow check */
@@ -1539,7 +1539,7 @@ PHP_FUNCTION(socket_send)
 	}
 
 	if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	retval = send(php_sock->bsd_socket, buf, (buf_len < (size_t)len ? buf_len : (size_t)len), flags);
@@ -1576,7 +1576,7 @@ PHP_FUNCTION(socket_recvfrom)
 	}
 
 	if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	/* overflow check */
@@ -1697,7 +1697,7 @@ PHP_FUNCTION(socket_sendto)
 	}
 
 	if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	switch (php_sock->type) {
@@ -1775,7 +1775,7 @@ PHP_FUNCTION(socket_get_option)
 	}
 
 	if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	if (level == IPPROTO_IP) {
@@ -1890,7 +1890,7 @@ PHP_FUNCTION(socket_set_option)
 	}
 
 	if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	set_errno(0);
@@ -2090,7 +2090,7 @@ PHP_FUNCTION(socket_shutdown)
 	}
 
 	if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	if (shutdown(php_sock->bsd_socket, how_shutdown) != 0) {
@@ -2116,7 +2116,7 @@ PHP_FUNCTION(socket_last_error)
 
 	if (arg1) {
 		if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
-			RETURN_FALSE;
+			return;
 		}
 		RETVAL_LONG(php_sock->error);
 	} else {
@@ -2138,7 +2138,7 @@ PHP_FUNCTION(socket_clear_error)
 
 	if (arg1) {
 		if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
-			RETURN_FALSE;
+			return;
 		}
 		php_sock->error = 0;
 	} else {
@@ -2257,7 +2257,7 @@ PHP_FUNCTION(socket_export_stream)
 		return;
 	}
 	if ((socket = (php_socket *) zend_fetch_resource(Z_RES_P(zsocket), le_socket_name, le_socket)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	/* Either we already exported a stream or the socket came from an import,
@@ -2414,7 +2414,7 @@ PHP_FUNCTION(socket_addrinfo_bind)
 	}
 
 	if ((ai = (struct addrinfo *) zend_fetch_resource(Z_RES_P(arg1), le_addrinfo_name, le_addrinfo)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	php_sock = php_create_socket();
@@ -2480,7 +2480,7 @@ PHP_FUNCTION(socket_addrinfo_connect)
 	}
 
 	if ((ai = (struct addrinfo *) zend_fetch_resource(Z_RES_P(arg1), le_addrinfo_name, le_addrinfo)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	php_sock = php_create_socket();
@@ -2544,7 +2544,7 @@ PHP_FUNCTION(socket_addrinfo_explain)
 	}
 
 	if ((ai = (struct addrinfo *) zend_fetch_resource(Z_RES_P(arg1), le_addrinfo_name, le_addrinfo)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	array_init(return_value);
@@ -2604,7 +2604,7 @@ PHP_FUNCTION(socket_wsaprotocol_info_export)
 		return;
 	}
 	if ((socket = (php_socket *) zend_fetch_resource(Z_RES_P(zsocket), le_socket_name, le_socket)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	if (SOCKET_ERROR == WSADuplicateSocket(socket->bsd_socket, (DWORD)target_pid, &wi)) {