hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

add judgement for ob_read_regard_ssl/ob_write_regard_ssl because when observer is stopping, fd_ could be -1

Browse Source
This commit is contained in:
obdev
2023-01-28 19:32:14 +08:00
committed by ob-robot
parent ba19ba90e0
commit bec4c86e69
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
deps/oblib/src/lib/ssl/ob_ssl_config.cpp vendored
View File

@ -485,7 +485,11 @@ ssize_t ob_read_regard_ssl(int fd, void *buf, size_t nbytes)
{ {
ssize_t rbytes = 0; ssize_t rbytes = 0;
SSL* ssl = NULL; SSL* ssl = NULL;
if (OB_LIKELY(NULL == (ssl = gs_ssl_array[fd].ssl))) { if (OB_UNLIKELY(fd < 0 || fd > FD_MAX)) {
COMMON_LOG(ERROR, "fd is beyond limit", K(fd));
rbytes = -1;
errno = EINVAL;
} else if (OB_LIKELY(NULL == (ssl = gs_ssl_array[fd].ssl))) {
rbytes = read(fd, buf, nbytes); rbytes = read(fd, buf, nbytes);
} else { } else {
if (OB_UNLIKELY(0 == gs_ssl_array[fd].hand_shake_done)) { if (OB_UNLIKELY(0 == gs_ssl_array[fd].hand_shake_done)) {
@ -544,7 +548,11 @@ ssize_t ob_write_regard_ssl(int fd, const void *buf, size_t nbytes)
{ {
ssize_t wbytes = 0; ssize_t wbytes = 0;
SSL* ssl = NULL; SSL* ssl = NULL;
if (OB_LIKELY(NULL == (ssl = gs_ssl_array[fd].ssl))) { if (OB_UNLIKELY(fd < 0 || fd > FD_MAX)) {
COMMON_LOG(ERROR, "fd is beyond limit", K(fd));
wbytes = -1;
errno = EINVAL;
} else if (OB_LIKELY(NULL == (ssl = gs_ssl_array[fd].ssl))) {
wbytes = write(fd, buf, nbytes); wbytes = write(fd, buf, nbytes);
} else { } else {
if (OB_UNLIKELY(0 == gs_ssl_array[fd].hand_shake_done)) { if (OB_UNLIKELY(0 == gs_ssl_array[fd].hand_shake_done)) {