From 21f06227273d82b158d74ae88073b2a05872d10c Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Thu, 9 Feb 2023 17:59:11 +0200 Subject: [PATCH 1/2] lib: Release memory of YANG translation module on error Signed-off-by: Donatas Abraitis (cherry picked from commit b9941b3fec21eca413c4ca9460a264eb9afb7e34) --- lib/yang_translator.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/yang_translator.c b/lib/yang_translator.c index 67b7f9aa70..f37084f0d4 100644 --- a/lib/yang_translator.c +++ b/lib/yang_translator.c @@ -127,10 +127,15 @@ static void yang_mapping_add(struct yang_translator *translator, int dir, } } +static void yang_tmodule_delete(struct yang_tmodule *tmodule) +{ + XFREE(MTYPE_YANG_TRANSLATOR_MODULE, tmodule); +} + struct yang_translator *yang_translator_load(const char *path) { struct yang_translator *translator; - struct yang_tmodule *tmodule; + struct yang_tmodule *tmodule = NULL; const char *family; struct lyd_node *dnode; struct ly_set *set; @@ -282,15 +287,11 @@ struct yang_translator *yang_translator_load(const char *path) error: yang_dnode_free(dnode); yang_translator_unload(translator); + yang_tmodule_delete(tmodule); return NULL; } -static void yang_tmodule_delete(struct yang_tmodule *tmodule) -{ - XFREE(MTYPE_YANG_TRANSLATOR_MODULE, tmodule); -} - void yang_translator_unload(struct yang_translator *translator) { for (size_t i = 0; i < YANG_TRANSLATE_MAX; i++) From 14f5d3478f2233ce241aaa4fbdd745f496ac1c20 Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Thu, 9 Feb 2023 23:14:46 +0200 Subject: [PATCH 2/2] lib: Free dnode before returning if YANG translator model is already loaded Seems just a missed one because at `goto error` we release dnode. Signed-off-by: Donatas Abraitis (cherry picked from commit ecf82aa41e76ecfbaf3f5762af1e90ebc9263721) --- lib/yang_translator.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/yang_translator.c b/lib/yang_translator.c index f37084f0d4..de5dc4d434 100644 --- a/lib/yang_translator.c +++ b/lib/yang_translator.c @@ -165,6 +165,7 @@ struct yang_translator *yang_translator_load(const char *path) flog_warn(EC_LIB_YANG_TRANSLATOR_LOAD, "%s: module translator \"%s\" is loaded already", __func__, family); + yang_dnode_free(dnode); return NULL; }