net: lwm2m: Coap Pending clear update

Fixed couple possible place for leak Coap pending entry.

Signed-off-by: Juha Heiskanen <juha.heiskanen@nordicsemi.no>
(cherry picked from commit 3c175951383be56fa9c1451845a15b66df41ff64)

Author: Juha Heiskanen

subsys/net/lib/lwm2m/lwm2m_engine.c

@@ -1326,21 +1326,28 @@ struct lwm2m_message *lwm2m_get_message(struct lwm2m_ctx *client_ctx)
 	return NULL;
 }
 
-void lwm2m_reset_message(struct lwm2m_message *msg, bool release)
+static void lm2m_message_clear_allocations(struct lwm2m_message *msg)
 {
-	if (!msg) {
-		return;
-	}
-
 	if (msg->pending) {
 		coap_pending_clear(msg->pending);
+		msg->pending = NULL;
 	}
 
 	if (msg->reply) {
 		/* make sure we want to clear the reply */
 		coap_reply_clear(msg->reply);
+		msg->reply = NULL;
+	}
+}
+
+void lwm2m_reset_message(struct lwm2m_message *msg, bool release)
+{
+	if (!msg) {
+		return;
 	}
 
+	lm2m_message_clear_allocations(msg);
+
 	if (msg->ctx) {
 		sys_slist_find_and_remove(&msg->ctx->pending_sends, &msg->node);
 #if defined(CONFIG_LWM2M_QUEUE_MODE_ENABLED)
@@ -1375,6 +1382,8 @@ int lwm2m_init_message(struct lwm2m_message *msg)
 		token = msg->token;
 	}
 
+	lm2m_message_clear_allocations(msg);
+
 	r = coap_packet_init(&msg->cpkt, msg->msg_data, sizeof(msg->msg_data),
 			     COAP_VERSION_1, msg->type, tokenlen, token,
 			     msg->code, msg->mid);
@@ -5078,6 +5087,10 @@ static int lwm2m_response_promote_to_con(struct lwm2m_message *msg)
 	msg->cpkt.data[2] = msg->mid >> 8;
 	msg->cpkt.data[3] = (uint8_t) msg->mid;
 
+	if (msg->pending) {
+		coap_pending_clear(msg->pending);
+	}
+
 	/* Add the packet to the pending list. */
 	msg->pending = coap_pending_next_unused(
 				msg->ctx->pendings,
@@ -5125,6 +5138,7 @@ static void lwm2m_udp_receive(struct lwm2m_ctx *client_ctx,
 		msg = find_msg(pending, NULL);
 		if (msg == NULL) {
 			LOG_DBG("Orphaned pending %p.", pending);
+			coap_pending_clear(pending);
 			return;
 		}