d0kuhn/mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only call ERR_clear_error() after an error has occurred.

Browse Source
This commit is contained in:
Roger A. Light 2019-10-24 22:57:05 +01:00
parent 253326dcc9
commit 47dadb902d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/net_mosq.c
View File

@ -856,7 +856,6 @@ ssize_t net__read(struct mosquitto *mosq, void *buf, size_t count)
errno = 0; errno = 0;
#ifdef WITH_TLS #ifdef WITH_TLS
if(mosq->ssl){ if(mosq->ssl){
ERR_clear_error();
ret = SSL_read(mosq->ssl, buf, count); ret = SSL_read(mosq->ssl, buf, count);
if(ret <= 0){ if(ret <= 0){
err = SSL_get_error(mosq->ssl, ret); err = SSL_get_error(mosq->ssl, ret);
@ -871,6 +870,7 @@ ssize_t net__read(struct mosquitto *mosq, void *buf, size_t count)
net__print_ssl_error(mosq); net__print_ssl_error(mosq);
errno = EPROTO; errno = EPROTO;
} }
ERR_clear_error();
#ifdef WIN32 #ifdef WIN32
WSASetLastError(errno); WSASetLastError(errno);
#endif #endif
@ -904,7 +904,6 @@ ssize_t net__write(struct mosquitto *mosq, void *buf, size_t count)
#ifdef WITH_TLS #ifdef WITH_TLS
if(mosq->ssl){ if(mosq->ssl){
mosq->want_write = false; mosq->want_write = false;
ERR_clear_error();
ret = SSL_write(mosq->ssl, buf, count); ret = SSL_write(mosq->ssl, buf, count);
if(ret < 0){ if(ret < 0){
err = SSL_get_error(mosq->ssl, ret); err = SSL_get_error(mosq->ssl, ret);
@ -919,6 +918,7 @@ ssize_t net__write(struct mosquitto *mosq, void *buf, size_t count)
net__print_ssl_error(mosq); net__print_ssl_error(mosq);
errno = EPROTO; errno = EPROTO;
} }
ERR_clear_error();
#ifdef WIN32 #ifdef WIN32
WSASetLastError(errno); WSASetLastError(errno);
#endif #endif