From 1af53a32ce4ebfea64dcc4ec45f4fd2785a34735 Mon Sep 17 00:00:00 2001
From: Dave Cornejo <dave@dogwood.com>
Date: Fri, 13 Nov 2020 11:41:31 -0500
Subject: [PATCH 1/2] make xml2xpath1() less picky

this function would never traverse up an XML tree from a node that
was not bound to a YANG model. this prevents the function from
working in some cases where it could.
---
 lib/src/clixon_xml_map.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/src/clixon_xml_map.c b/lib/src/clixon_xml_map.c
index 04b3c0c1..e45f0e2c 100644
--- a/lib/src/clixon_xml_map.c
+++ b/lib/src/clixon_xml_map.c
@@ -1503,8 +1503,7 @@ xml2xpath1(cxobj *x,
     char         *b;
     enum rfc_6020 keyword;
     
-    if ((xp = xml_parent(x)) != NULL &&
-	xml_spec(xp) != NULL)
+    if (xp = xml_parent(x))
 	xml2xpath1(xp, cb);
     /* XXX: sometimes there should be a /, sometimes not */
     cprintf(cb, "/%s", xml_name(x));

From 07f96934b3089a59964c508c58b17588a9571b05 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Wed, 16 Dec 2020 11:37:02 +0100
Subject: [PATCH 2/2] need to check grand-parent exists

---
 lib/src/clixon_xml_map.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/src/clixon_xml_map.c b/lib/src/clixon_xml_map.c
index e45f0e2c..646ec408 100644
--- a/lib/src/clixon_xml_map.c
+++ b/lib/src/clixon_xml_map.c
@@ -1503,8 +1503,9 @@ xml2xpath1(cxobj *x,
     char         *b;
     enum rfc_6020 keyword;
     
-    if (xp = xml_parent(x))
-	xml2xpath1(xp, cb);
+    if ((xp = xml_parent(x)) == NULL)
+	goto ok;
+    xml2xpath1(xp, cb);
     /* XXX: sometimes there should be a /, sometimes not */
     cprintf(cb, "/%s", xml_name(x));
     if ((y = xml_spec(x)) != NULL){
@@ -1533,6 +1534,7 @@ xml2xpath1(cxobj *x,
 	    break;
 	}
     }
+ ok:
     retval = 0;
  done:
     return retval;