These memory leaks are ones that will compound over time with node
creation and deletion.
---
mesh/mesh-config-json.c | 16 ++++++++--------
mesh/mesh.c | 5 ++++-
mesh/node.c | 1 +
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/mesh/mesh-config-json.c b/mesh/mesh-config-json.c
index 9ac3979f8..6567d761c 100644
--- a/mesh/mesh-config-json.c
+++ b/mesh/mesh-config-json.c
@@ -447,8 +447,6 @@ static bool read_app_keys(json_object *jobj, struct mesh_config_node *node)
if (!len)
return true;
- node->appkeys = l_queue_new();
-
for (i = 0; i < len; ++i) {
json_object *jtemp, *jvalue;
char *str;
@@ -505,8 +503,6 @@ static bool read_net_keys(json_object *jobj, struct mesh_config_node *node)
if (!len)
return false;
- node->netkeys = l_queue_new();
-
for (i = 0; i < len; ++i) {
json_object *jtemp, *jvalue;
char *str;
@@ -1133,8 +1129,6 @@ static bool parse_elements(json_object *jelems, struct mesh_config_node *node)
/* Allow "empty" nodes */
return true;
- node->elements = l_queue_new();
-
for (i = 0; i < num_ele; ++i) {
json_object *jelement;
json_object *jmodels;
@@ -1154,6 +1148,7 @@ static bool parse_elements(json_object *jelems, struct mesh_config_node *node)
ele = l_new(struct mesh_config_element, 1);
ele->index = index;
ele->models = l_queue_new();
+ l_queue_push_tail(node->elements, ele);
if (!json_object_object_get_ex(jelement, "location", &jvalue))
goto fail;
@@ -1167,8 +1162,6 @@ static bool parse_elements(json_object *jelems, struct mesh_config_node *node)
!parse_models(jmodels, ele))
goto fail;
}
-
- l_queue_push_tail(node->elements, ele);
}
return true;
@@ -2133,6 +2126,11 @@ static bool load_node(const char *fname, const uint8_t uuid[16],
goto done;
memset(&node, 0, sizeof(node));
+
+ node.elements = l_queue_new();
+ node.netkeys = l_queue_new();
+ node.appkeys = l_queue_new();
+
result = read_node(jnode, &node);
if (result) {
@@ -2148,6 +2146,7 @@ static bool load_node(const char *fname, const uint8_t uuid[16],
result = cb(&node, uuid, cfg, user_data);
if (!result) {
+ l_free(cfg->idles);
l_free(cfg->node_dir_path);
l_free(cfg);
}
@@ -2157,6 +2156,7 @@ static bool load_node(const char *fname, const uint8_t uuid[16],
l_free(node.net_transmit);
l_queue_destroy(node.netkeys, l_free);
l_queue_destroy(node.appkeys, l_free);
+ l_queue_destroy(node.elements, free_element);
if (!result)
json_object_put(jnode);
diff --git a/mesh/mesh.c b/mesh/mesh.c
index 890a3aa8f..23ff9c2a8 100644
--- a/mesh/mesh.c
+++ b/mesh/mesh.c
@@ -209,7 +209,7 @@ static void parse_settings(const char *mesh_conf_fname)
settings = l_settings_new();
if (!l_settings_load_from_file(settings, mesh_conf_fname))
- return;
+ goto done;
str = l_settings_get_string(settings, "General", "Beacon");
if (str) {
@@ -242,6 +242,9 @@ static void parse_settings(const char *mesh_conf_fname)
if (l_settings_get_uint(settings, "General", "ProvTimeout", &value))
mesh.prov_timeout = value;
+
+done:
+ l_settings_free(settings);
}
bool mesh_init(const char *config_dir, const char *mesh_conf_fname,
diff --git a/mesh/node.c b/mesh/node.c
index 581899562..382997a4c 100644
--- a/mesh/node.c
+++ b/mesh/node.c
@@ -336,6 +336,7 @@ static void free_node_resources(void *data)
free_node_dbus_resources(node);
+ mesh_config_release(node->cfg);
mesh_net_free(node->net);
l_free(node->storage_dir);
l_free(node);
--
2.25.4
