From: Donatas Abraitis <donatas@opensourcerouting.org>
Date: Thu, 9 Feb 2023 15:59:11 +0000 (+0200)
Subject: lib: Release memory of YANG translation module on error
X-Git-Tag: frr-8.4.3~15^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=8093cc4b63c880f13c16a8d846722e5831cd2310;p=mirror%2Ffrr.git

lib: Release memory of YANG translation module on error

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit b9941b3fec21eca413c4ca9460a264eb9afb7e34)
---

diff --git a/lib/yang_translator.c b/lib/yang_translator.c
index d562e4d29e..f3a355f88c 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++)