GitHub/libevent
1
0
Fork 0
mirror of https://github.com/libevent/libevent.git synced 2025-01-09 00:56:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

bufferevent_ssl: do not return NULL from upcast

Browse Source 
/src/le/libevent/bufferevent_ssl.c:863: error: Null Dereference
      pointer `bev_ssl` last assigned on line 855 could be null and is dereferenced at line 863, column 6.
      861.          r2 = start_writing(bev_ssl);
      862.
      863.  if (bev_ssl->underlying) {
                ^
      864.          if (events & EV_READ)
      865.                  BEV_RESET_GENERIC_READ_TIMEOUT(bev);
This commit is contained in:
Azat Khuzhin 2024-02-18 18:22:21 +01:00
parent 5303493670
commit 2f27523e44
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bufferevent_mbedtls.c
View File

@ -292,9 +292,6 @@ bufferevent_mbedtls_get_ssl(struct bufferevent *bufev)
int int
bufferevent_mbedtls_renegotiate(struct bufferevent *bufev) bufferevent_mbedtls_renegotiate(struct bufferevent *bufev)
{ {
struct bufferevent_ssl *bev_ssl = bufferevent_ssl_upcast(bufev);
if (!bev_ssl)
return -1;
return bufferevent_ssl_renegotiate_impl(bufev); return bufferevent_ssl_renegotiate_impl(bufev);
} }

27
bufferevent_ssl.c
View File

@ -105,8 +105,7 @@ struct bufferevent_ssl *
bufferevent_ssl_upcast(struct bufferevent *bev) bufferevent_ssl_upcast(struct bufferevent *bev)
{ {
struct bufferevent_ssl *bev_o; struct bufferevent_ssl *bev_o;
if (!BEV_IS_SSL(bev)) EVUTIL_ASSERT(BEV_IS_SSL(bev));
return NULL;
bev_o = (void*)( ((char*)bev) - bev_o = (void*)( ((char*)bev) -
evutil_offsetof(struct bufferevent_ssl, bev.bev)); evutil_offsetof(struct bufferevent_ssl, bev.bev));
EVUTIL_ASSERT(BEV_IS_SSL(&bev_o->bev.bev)); EVUTIL_ASSERT(BEV_IS_SSL(&bev_o->bev.bev));
@ -815,9 +814,11 @@ set_handshake_callbacks(struct bufferevent_ssl *bev_ssl, evutil_socket_t fd)
int int
bufferevent_ssl_renegotiate_impl(struct bufferevent *bev) bufferevent_ssl_renegotiate_impl(struct bufferevent *bev)
{ {
struct bufferevent_ssl *bev_ssl = bufferevent_ssl_upcast(bev); struct bufferevent_ssl *bev_ssl;
if (!bev_ssl) if (!BEV_IS_SSL(bev))
return -1; return -1;
bev_ssl = bufferevent_ssl_upcast(bev);
if (bev_ssl->ssl_ops->renegotiate(bev_ssl->ssl) < 0) if (bev_ssl->ssl_ops->renegotiate(bev_ssl->ssl) < 0)
return -1; return -1;
bev_ssl->state = BUFFEREVENT_SSL_CONNECTING; bev_ssl->state = BUFFEREVENT_SSL_CONNECTING;
@ -1098,9 +1099,13 @@ bufferevent_get_ssl_error(struct bufferevent *bev)
{ {
unsigned long err = 0; unsigned long err = 0;
struct bufferevent_ssl *bev_ssl; struct bufferevent_ssl *bev_ssl;
if (BEV_IS_SSL(bev))
return err;
BEV_LOCK(bev); BEV_LOCK(bev);
bev_ssl = bufferevent_ssl_upcast(bev); bev_ssl = bufferevent_ssl_upcast(bev);
if (bev_ssl && bev_ssl->n_errors) { if (bev_ssl->n_errors) {
err = bev_ssl->errors[--bev_ssl->n_errors]; err = bev_ssl->errors[--bev_ssl->n_errors];
} }
BEV_UNLOCK(bev); BEV_UNLOCK(bev);
@ -1112,9 +1117,11 @@ ev_uint64_t bufferevent_ssl_get_flags(struct bufferevent *bev)
ev_uint64_t flags = EV_UINT64_MAX; ev_uint64_t flags = EV_UINT64_MAX;
struct bufferevent_ssl *bev_ssl; struct bufferevent_ssl *bev_ssl;
if (!BEV_IS_SSL(bev))
return flags;
BEV_LOCK(bev); BEV_LOCK(bev);
bev_ssl = bufferevent_ssl_upcast(bev); bev_ssl = bufferevent_ssl_upcast(bev);
if (bev_ssl)
flags = bev_ssl->flags; flags = bev_ssl->flags;
BEV_UNLOCK(bev); BEV_UNLOCK(bev);
@ -1126,15 +1133,13 @@ ev_uint64_t bufferevent_ssl_set_flags(struct bufferevent *bev, ev_uint64_t flags
struct bufferevent_ssl *bev_ssl; struct bufferevent_ssl *bev_ssl;
flags &= (BUFFEREVENT_SSL_DIRTY_SHUTDOWN|BUFFEREVENT_SSL_BATCH_WRITE); flags &= (BUFFEREVENT_SSL_DIRTY_SHUTDOWN|BUFFEREVENT_SSL_BATCH_WRITE);
if (!flags) if (!flags || !BEV_IS_SSL(bev))
return old_flags; return old_flags;
BEV_LOCK(bev); BEV_LOCK(bev);
bev_ssl = bufferevent_ssl_upcast(bev); bev_ssl = bufferevent_ssl_upcast(bev);
if (bev_ssl) {
old_flags = bev_ssl->flags; old_flags = bev_ssl->flags;
bev_ssl->flags |= flags; bev_ssl->flags |= flags;
}
BEV_UNLOCK(bev); BEV_UNLOCK(bev);
return old_flags; return old_flags;
@ -1145,15 +1150,13 @@ ev_uint64_t bufferevent_ssl_clear_flags(struct bufferevent *bev, ev_uint64_t fla
struct bufferevent_ssl *bev_ssl; struct bufferevent_ssl *bev_ssl;
flags &= (BUFFEREVENT_SSL_DIRTY_SHUTDOWN|BUFFEREVENT_SSL_BATCH_WRITE); flags &= (BUFFEREVENT_SSL_DIRTY_SHUTDOWN|BUFFEREVENT_SSL_BATCH_WRITE);
if (!flags) if (!flags || !BEV_IS_SSL(bev))
return old_flags; return old_flags;
BEV_LOCK(bev); BEV_LOCK(bev);
bev_ssl = bufferevent_ssl_upcast(bev); bev_ssl = bufferevent_ssl_upcast(bev);
if (bev_ssl) {
old_flags = bev_ssl->flags; old_flags = bev_ssl->flags;
bev_ssl->flags &= ~flags; bev_ssl->flags &= ~flags;
}
BEV_UNLOCK(bev); BEV_UNLOCK(bev);
return old_flags; return old_flags;