Skip to content

Commit 77bd1ce

Browse files
cmb69cmb69
committed
Just return after exception has been thrown
1 parent 428bd3d commit 77bd1ce

File tree

2 files changed

+27
-27
lines changed

2 files changed

+27
-27
lines changed

‎ext/sockets/sendrecvmsg.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ PHP_FUNCTION(socket_sendmsg)
181181

182182
if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(zsocket),
183183
php_sockets_le_socket_name, php_sockets_le_socket())) == NULL) {
184-
RETURN_FALSE;
184+
return;
185185
}
186186

187187
msghdr = from_zval_run_conversions(zmsg, php_sock, from_zval_write_msghdr_send,
@@ -226,7 +226,7 @@ PHP_FUNCTION(socket_recvmsg)
226226

227227
if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(zsocket),
228228
php_sockets_le_socket_name, php_sockets_le_socket())) == NULL) {
229-
RETURN_FALSE;
229+
return;
230230
}
231231

232232
msghdr = from_zval_run_conversions(zmsg, php_sock, from_zval_write_msghdr_recv,

‎ext/sockets/sockets.c

+25-25
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@ PHP_FUNCTION(socket_accept)
846846
}
847847

848848
if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
849-
RETURN_FALSE;
849+
return;
850850
}
851851

852852
if (!php_accept_connect(php_sock, &new_sock, (struct sockaddr*)&sa, &php_sa_len)) {
@@ -869,7 +869,7 @@ PHP_FUNCTION(socket_set_nonblock)
869869
}
870870

871871
if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
872-
RETURN_FALSE;
872+
return;
873873
}
874874

875875
if (!Z_ISUNDEF(php_sock->zstream)) {
@@ -907,7 +907,7 @@ PHP_FUNCTION(socket_set_block)
907907
}
908908

909909
if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
910-
RETURN_FALSE;
910+
return;
911911
}
912912

913913
/* if socket was created from a stream, give the stream a chance to take
@@ -948,7 +948,7 @@ PHP_FUNCTION(socket_listen)
948948
}
949949

950950
if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
951-
RETURN_FALSE;
951+
return;
952952
}
953953

954954
if (listen(php_sock->bsd_socket, backlog) != 0) {
@@ -971,7 +971,7 @@ PHP_FUNCTION(socket_close)
971971
}
972972

973973
if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
974-
RETURN_FALSE;
974+
return;
975975
}
976976

977977
if (!Z_ISUNDEF(php_sock->zstream)) {
@@ -1010,7 +1010,7 @@ PHP_FUNCTION(socket_write)
10101010
}
10111011

10121012
if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
1013-
RETURN_FALSE;
1013+
return;
10141014
}
10151015

10161016
if (ZEND_NUM_ARGS() < 3) {
@@ -1054,7 +1054,7 @@ PHP_FUNCTION(socket_read)
10541054
tmpbuf = zend_string_alloc(length, 0);
10551055

10561056
if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
1057-
RETURN_FALSE;
1057+
return;
10581058
}
10591059

10601060
if (type == PHP_NORMAL_READ) {
@@ -1114,7 +1114,7 @@ PHP_FUNCTION(socket_getsockname)
11141114
}
11151115

11161116
if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
1117-
RETURN_FALSE;
1117+
return;
11181118
}
11191119

11201120
sa = (struct sockaddr *) &sa_storage;
@@ -1188,7 +1188,7 @@ PHP_FUNCTION(socket_getpeername)
11881188
}
11891189

11901190
if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
1191-
RETURN_FALSE;
1191+
return;
11921192
}
11931193

11941194
sa = (struct sockaddr *) &sa_storage;
@@ -1303,7 +1303,7 @@ PHP_FUNCTION(socket_connect)
13031303
}
13041304

13051305
if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
1306-
RETURN_FALSE;
1306+
return;
13071307
}
13081308

13091309
switch(php_sock->type) {
@@ -1409,7 +1409,7 @@ PHP_FUNCTION(socket_bind)
14091409
}
14101410

14111411
if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
1412-
RETURN_FALSE;
1412+
return;
14131413
}
14141414

14151415
switch(php_sock->type) {
@@ -1491,7 +1491,7 @@ PHP_FUNCTION(socket_recv)
14911491
}
14921492

14931493
if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(php_sock_res), le_socket_name, le_socket)) == NULL) {
1494-
RETURN_FALSE;
1494+
return;
14951495
}
14961496

14971497
/* overflow check */
@@ -1539,7 +1539,7 @@ PHP_FUNCTION(socket_send)
15391539
}
15401540

15411541
if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
1542-
RETURN_FALSE;
1542+
return;
15431543
}
15441544

15451545
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)
15761576
}
15771577

15781578
if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
1579-
RETURN_FALSE;
1579+
return;
15801580
}
15811581

15821582
/* overflow check */
@@ -1697,7 +1697,7 @@ PHP_FUNCTION(socket_sendto)
16971697
}
16981698

16991699
if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
1700-
RETURN_FALSE;
1700+
return;
17011701
}
17021702

17031703
switch (php_sock->type) {
@@ -1775,7 +1775,7 @@ PHP_FUNCTION(socket_get_option)
17751775
}
17761776

17771777
if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
1778-
RETURN_FALSE;
1778+
return;
17791779
}
17801780

17811781
if (level == IPPROTO_IP) {
@@ -1890,7 +1890,7 @@ PHP_FUNCTION(socket_set_option)
18901890
}
18911891

18921892
if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
1893-
RETURN_FALSE;
1893+
return;
18941894
}
18951895

18961896
set_errno(0);
@@ -2090,7 +2090,7 @@ PHP_FUNCTION(socket_shutdown)
20902090
}
20912091

20922092
if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
2093-
RETURN_FALSE;
2093+
return;
20942094
}
20952095

20962096
if (shutdown(php_sock->bsd_socket, how_shutdown) != 0) {
@@ -2116,7 +2116,7 @@ PHP_FUNCTION(socket_last_error)
21162116

21172117
if (arg1) {
21182118
if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
2119-
RETURN_FALSE;
2119+
return;
21202120
}
21212121
RETVAL_LONG(php_sock->error);
21222122
} else {
@@ -2138,7 +2138,7 @@ PHP_FUNCTION(socket_clear_error)
21382138

21392139
if (arg1) {
21402140
if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(arg1), le_socket_name, le_socket)) == NULL) {
2141-
RETURN_FALSE;
2141+
return;
21422142
}
21432143
php_sock->error = 0;
21442144
} else {
@@ -2257,7 +2257,7 @@ PHP_FUNCTION(socket_export_stream)
22572257
return;
22582258
}
22592259
if ((socket = (php_socket *) zend_fetch_resource(Z_RES_P(zsocket), le_socket_name, le_socket)) == NULL) {
2260-
RETURN_FALSE;
2260+
return;
22612261
}
22622262

22632263
/* Either we already exported a stream or the socket came from an import,
@@ -2414,7 +2414,7 @@ PHP_FUNCTION(socket_addrinfo_bind)
24142414
}
24152415

24162416
if ((ai = (struct addrinfo *) zend_fetch_resource(Z_RES_P(arg1), le_addrinfo_name, le_addrinfo)) == NULL) {
2417-
RETURN_FALSE;
2417+
return;
24182418
}
24192419

24202420
php_sock = php_create_socket();
@@ -2480,7 +2480,7 @@ PHP_FUNCTION(socket_addrinfo_connect)
24802480
}
24812481

24822482
if ((ai = (struct addrinfo *) zend_fetch_resource(Z_RES_P(arg1), le_addrinfo_name, le_addrinfo)) == NULL) {
2483-
RETURN_FALSE;
2483+
return;
24842484
}
24852485

24862486
php_sock = php_create_socket();
@@ -2544,7 +2544,7 @@ PHP_FUNCTION(socket_addrinfo_explain)
25442544
}
25452545

25462546
if ((ai = (struct addrinfo *) zend_fetch_resource(Z_RES_P(arg1), le_addrinfo_name, le_addrinfo)) == NULL) {
2547-
RETURN_FALSE;
2547+
return;
25482548
}
25492549

25502550
array_init(return_value);
@@ -2604,7 +2604,7 @@ PHP_FUNCTION(socket_wsaprotocol_info_export)
26042604
return;
26052605
}
26062606
if ((socket = (php_socket *) zend_fetch_resource(Z_RES_P(zsocket), le_socket_name, le_socket)) == NULL) {
2607-
RETURN_FALSE;
2607+
return;
26082608
}
26092609

26102610
if (SOCKET_ERROR == WSADuplicateSocket(socket->bsd_socket, (DWORD)target_pid, &wi)) {

0 commit comments

Comments
 (0)