archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix missing checks against php_set_blocking() in xp_ssl.c

Browse source
This commit is contained in:
Niels Dossche 2025-05-19 21:29:00 +02:00
parent b2d78ae00c
commit 31ebb42268
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ext/openssl/xp_ssl.c
View file

@ -2092,8 +2092,9 @@ static ssize_t php_openssl_sockop_io(int read, php_stream *stream, char *buf, si
if (php_openssl_compare_timeval(elapsed_time, *timeout) > 0 ) { if (php_openssl_compare_timeval(elapsed_time, *timeout) > 0 ) {
/* If the socket was originally blocking, set it back. */ /* If the socket was originally blocking, set it back. */
if (began_blocked) { if (began_blocked) {
php_set_sock_blocking(sslsock->s.socket, 1); if (php_set_sock_blocking(sslsock->s.socket, 1) == SUCCESS) {
sslsock->s.is_blocked = 1; sslsock->s.is_blocked = 1;
}
} }
sslsock->s.timeout_event = 1; sslsock->s.timeout_event = 1;
return -1; return -1;
@ -2520,8 +2521,9 @@ static int php_openssl_sockop_set_option(php_stream *stream, int option, int val
if (php_openssl_compare_timeval(elapsed_time, *timeout) > 0 ) { if (php_openssl_compare_timeval(elapsed_time, *timeout) > 0 ) {
/* If the socket was originally blocking, set it back. */ /* If the socket was originally blocking, set it back. */
if (began_blocked) { if (began_blocked) {
php_set_sock_blocking(sslsock->s.socket, 1); if (php_set_sock_blocking(sslsock->s.socket, 1) == SUCCESS) {
sslsock->s.is_blocked = 1; sslsock->s.is_blocked = 1;
}
} }
sslsock->s.timeout_event = 1; sslsock->s.timeout_event = 1;
return PHP_STREAM_OPTION_RETURN_ERR; return PHP_STREAM_OPTION_RETURN_ERR;
@ -2572,8 +2574,9 @@ static int php_openssl_sockop_set_option(php_stream *stream, int option, int val
if (began_blocked && !sslsock->s.is_blocked) { if (began_blocked && !sslsock->s.is_blocked) {
// Set it back to blocking // Set it back to blocking
php_set_sock_blocking(sslsock->s.socket, 1); if (php_set_sock_blocking(sslsock->s.socket, 1) == SUCCESS) {
sslsock->s.is_blocked = 1; sslsock->s.is_blocked = 1;
}
} }
} else { } else {
#ifdef PHP_WIN32 #ifdef PHP_WIN32