From f3c1542900bd657553a4b0ba4476736d13d742b0 Mon Sep 17 00:00:00 2001 From: Olaf Bergmann Date: Mon, 12 Mar 2018 16:00:16 +0100 Subject: [PATCH] coap_session.c: reference new session objects before release In case of failure, coap_session_accept() and coap_session_connect() need to release the session object that has been passed as parameter. Usually, session->ref would be 0 at the time these functions are called, causing coap_session_release() to abort in debug mode. To ensure that the object is referenced at least once, coap_session_reference() is therefore called before coap_session_release(). This fixes an error introduced in ommit 46c908a. This change closes issue #155. --- src/coap_session.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/coap_session.c b/src/coap_session.c index ea064eba..918e8f8d 100644 --- a/src/coap_session.c +++ b/src/coap_session.c @@ -531,6 +531,11 @@ coap_session_connect(coap_session_t *session) { if (session->tls) { session->state = COAP_SESSION_STATE_HANDSHAKE; } else { + /* Need to free session object. As a new session may not yet + * have been referenced, we call coap_session_reference() first + * before trying to release the object. + */ + coap_session_reference(session); coap_session_release(session); return NULL; } @@ -547,6 +552,11 @@ coap_session_connect(coap_session_t *session) { coap_session_send_csm(session); } } else { + /* Need to free session object. As a new session may not yet + * have been referenced, we call coap_session_reference() + * first before trying to release the object. + */ + coap_session_reference(session); coap_session_release(session); return NULL; } @@ -572,6 +582,11 @@ coap_session_accept(coap_session_t *session) { coap_session_send_csm(session); } } else { + /* Need to free session object. As a new session may not yet + * have been referenced, we call coap_session_reference() first + * before trying to release the object. + */ + coap_session_reference(session); coap_session_release(session); session = NULL; }