From ffdaeed4171ab90271ff111d47471b7874a81f81 Mon Sep 17 00:00:00 2001 From: Inga Stotland Date: Mon, 9 Nov 2020 20:24:51 -0800 Subject: [PATCH] mesh: Fix memory leak when failing to load a node This fixes a memory leak that may occur on unsuccessful element initialization from storage. --- mesh/node.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/mesh/node.c b/mesh/node.c index 11b0c9442..35293e0f0 100644 --- a/mesh/node.c +++ b/mesh/node.c @@ -326,16 +326,13 @@ static bool add_element_from_storage(struct mesh_node *node, ele->idx = db_ele->index; ele->location = db_ele->location; - - - if (!ele->models) - ele->models = l_queue_new(); + ele->models = l_queue_new(); + l_queue_push_tail(node->elements, ele); if (!mesh_model_add_from_storage(node, ele->idx, ele->models, db_ele->models)) return false; - l_queue_push_tail(node->elements, ele); return true; } -- 2.47.3