| Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame^] | 1 | From c56a64ff4df7eecb6c88ff929497bcd0d65934f2 Mon Sep 17 00:00:00 2001 |
| 2 | From: Jon Shallow <supjps-libcoap@jpshallow.com> |
| 3 | Date: Fri, 22 Apr 2022 13:15:39 +0100 |
| 4 | Subject: [PATCH] coap_session.c: Balance SESSIONS_ADD and SESSIONS_DELETE |
| 5 | usage |
| 6 | |
| 7 | Upstream-Status: Backport [https://github.com/obgm/libcoap/commit/7e20aa9ef17277f39203334404e6c776b1171a7d] |
| 8 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> |
| 9 | Signed-off-by: Alex Kiernan <alexk@zuma.ai> |
| 10 | --- |
| 11 | src/coap_session.c | 12 ++++++++++++ |
| 12 | 1 file changed, 12 insertions(+) |
| 13 | |
| 14 | diff --git a/src/coap_session.c b/src/coap_session.c |
| 15 | index 77cae598f0af..536e57573361 100644 |
| 16 | --- a/src/coap_session.c |
| 17 | +++ b/src/coap_session.c |
| 18 | @@ -813,6 +813,12 @@ coap_session_create_client( |
| 19 | return session; |
| 20 | |
| 21 | error: |
| 22 | + /* |
| 23 | + * Need to add in the session as coap_session_release() |
| 24 | + * will call SESSIONS_DELETE in coap_session_free(). |
| 25 | + */ |
| 26 | + if (session) |
| 27 | + SESSIONS_ADD(ctx->sessions, session); |
| 28 | coap_session_release(session); |
| 29 | return NULL; |
| 30 | } |
| 31 | @@ -1133,11 +1139,17 @@ coap_session_t *coap_new_server_session( |
| 32 | if (session) { |
| 33 | coap_log(LOG_DEBUG, "***%s: new incoming session\n", |
| 34 | coap_session_str(session)); |
| 35 | + /* Returned session may already have been released and is now NULL */ |
| 36 | session = coap_session_accept(session); |
| 37 | } |
| 38 | return session; |
| 39 | |
| 40 | error: |
| 41 | + /* |
| 42 | + * Need to add in the session as coap_session_release() |
| 43 | + * will call SESSIONS_DELETE in coap_session_free(). |
| 44 | + */ |
| 45 | + SESSIONS_ADD(ep->sessions, session); |
| 46 | coap_session_free(session); |
| 47 | return NULL; |
| 48 | } |
| 49 | -- |
| 50 | 2.35.1 |
| 51 | |