obgm/libcoap
2
0 Fork 0
mirror of https://github.com/obgm/libcoap.git synced 2026-11-14 12:19:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

net.c: Protect against session release in coap_io_do_io()

Browse Source 
Wrap the whole iteration with  coap_session_reference() /
coap_session_release() instead of the individual if() statements within.

coap_io_do_epoll() is already suitably protected.
This commit is contained in:
Jon Shallow committed 2021-09-08 14:42:56 +01:00
1 parent ca44071b8a
commit cc2648aef6
1 file changed
+8 -17
Download Patch File Download Diff File Expand all files Collapse all files
src/net.c
+8 -17
View File
@@ -1753,40 +1753,31 @@ coap_io_do_io(coap_context_t *ctx, coap_tick_t now) {
if ((ep->sock.flags & COAP_SOCKET_CAN_ACCEPT) != 0)
coap_accept_endpoint(ctx, ep, now);
SESSIONS_ITER_SAFE(ep->sessions, s, rtmp) {
/* Make sure the session object is not deleted in one of the callbacks */
coap_session_reference(s);
if ((s->sock.flags & COAP_SOCKET_CAN_READ) != 0) {
/* Make sure the session object is not deleted in one of the callbacks */
coap_session_reference(s);
coap_read_session(ctx, s, now);
coap_session_release(s);
}
if ((s->sock.flags & COAP_SOCKET_CAN_WRITE) != 0) {
/* Make sure the session object is not deleted in one of the callbacks */
coap_session_reference(s);
coap_write_session(ctx, s, now);
coap_session_release(s);
}
coap_session_release(s);
}
}
SESSIONS_ITER_SAFE(ctx->sessions, s, rtmp) {
/* Make sure the session object is not deleted in one of the callbacks */
coap_session_reference(s);
if ((s->sock.flags & COAP_SOCKET_CAN_CONNECT) != 0) {
/* Make sure the session object is not deleted in one of the callbacks */
coap_session_reference(s);
coap_connect_session(ctx, s, now);
coap_session_release( s );
}
if ((s->sock.flags & COAP_SOCKET_CAN_READ) != 0) {
/* Make sure the session object is not deleted in one of the callbacks */
coap_session_reference(s);
if ((s->sock.flags & COAP_SOCKET_CAN_READ) != 0 && s->ref > 1) {
coap_read_session(ctx, s, now);
coap_session_release(s);
}
if ((s->sock.flags & COAP_SOCKET_CAN_WRITE) != 0) {
/* Make sure the session object is not deleted in one of the callbacks */
coap_session_reference(s);
if ((s->sock.flags & COAP_SOCKET_CAN_WRITE) != 0 && s->ref > 1) {
coap_write_session(ctx, s, now);
coap_session_release( s );
}
coap_session_release( s );
}
#endif /* ! COAP_EPOLL_SUPPORT */
}