Merge pull request #13649 from donaldsharp/unlock_the_node_or_else

[mirror_frr.git] / lib / yang_translator.c

diff --git a/lib/yang_translator.c b/lib/yang_translator.c
index 67b7f9aa700e40473c2ac3cb50d60c095c0742f3..eae7577a0d1c2c905261a9c211c73deb283f08dc 100644 (file)
--- a/lib/yang_translator.c
+++ b/lib/yang_translator.c
@@ -1,20 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018  NetDEF, Inc.
  *                     Renato Westphal
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <zebra.h>
@@ -127,10 +114,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;
@@ -160,6 +152,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;
        }
 
@@ -242,8 +235,8 @@ struct yang_translator *yang_translator_load(const char *path)
                xpath_custom =
                        yang_dnode_get_string(set->dnodes[i], "./custom");
 
-               snode_custom = lys_find_path(translator->ly_ctx, NULL,
-                                            xpath_custom, 0);
+               snode_custom =
+                       yang_find_snode(translator->ly_ctx, xpath_custom, 0);
                if (!snode_custom) {
                        flog_warn(EC_LIB_YANG_TRANSLATOR_LOAD,
                                  "%s: unknown data path: %s", __func__,
@@ -254,8 +247,7 @@ struct yang_translator *yang_translator_load(const char *path)
 
                xpath_native =
                        yang_dnode_get_string(set->dnodes[i], "./native");
-               snode_native =
-                       lys_find_path(ly_native_ctx, NULL, xpath_native, 0);
+               snode_native = yang_find_snode(ly_native_ctx, xpath_native, 0);
                if (!snode_native) {
                        flog_warn(EC_LIB_YANG_TRANSLATOR_LOAD,
                                  "%s: unknown data path: %s", __func__,
@@ -282,15 +274,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++)
@@ -326,7 +314,7 @@ yang_translate_xpath(const struct yang_translator *translator, int dir,
        else
                ly_ctx = ly_native_ctx;
 
-       snode = lys_find_path(ly_ctx, NULL, xpath, 0);
+       snode = yang_find_snode(ly_ctx, xpath, 0);
        if (!snode) {
                flog_warn(EC_LIB_YANG_TRANSLATION_ERROR,
                          "%s: unknown data path: %s", __func__, xpath);