From 8db7892e38f4869783ae22036e49be25bcfdf00d Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Tue, 20 Dec 2022 13:13:00 +0100
Subject: [PATCH] sanity checkof xret in param test: updated to new openconfig
 network-instance version

---
 lib/src/clixon_datastore_read.c          | 23 ++++++++++++++---------
 test/test_openconfig_network_instance.sh |  1 -
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/lib/src/clixon_datastore_read.c b/lib/src/clixon_datastore_read.c
index 91a2fcd8..3a8b6978 100644
--- a/lib/src/clixon_datastore_read.c
+++ b/lib/src/clixon_datastore_read.c
@@ -825,7 +825,7 @@ xmldb_get_nocache(clicon_handle    h,
  * @param[in]  nsc    External XML namespace context, or NULL
  * @param[in]  xpath  String with XPATH syntax. or NULL for all
  * @param[in]  wdef   With-defaults parameter, see RFC 6243
- * @param[out] xret   Single return XML tree. Free with xml_free()
+ * @param[out] xtop   Single return XML tree. Free with xml_free()
  * @param[out] msdiff If set, return modules-state differences
  * @param[out] xerr   XML error if retval is 0
  * @retval     -1     General error, check specific clicon_errno, clicon_suberrno
@@ -835,15 +835,15 @@ xmldb_get_nocache(clicon_handle    h,
  * @see xmldb_get  the generic API function
  */
 static int
-xmldb_get_cache(clicon_handle    h,
-                const char      *db, 
-                yang_bind        yb,
-                cvec            *nsc,
-                const char      *xpath,
+xmldb_get_cache(clicon_handle     h,
+                const char       *db, 
+                yang_bind         yb,
+                cvec             *nsc,
+                const char       *xpath,
                 withdefaults_type wdef,
-                cxobj          **xtop,
-                modstate_diff_t *msdiff,
-                cxobj          **xerr)
+                cxobj           **xtop,
+                modstate_diff_t  *msdiff,
+                cxobj           **xerr)
 
 {
     int        retval = -1;
@@ -1254,6 +1254,10 @@ xmldb_get0(clicon_handle    h,
 {
     int               retval = -1;
 
+    if (xret == NULL){
+        clicon_err(OE_DB, EINVAL, "xret is NULL");
+        goto done;
+    }
     switch (clicon_datastore_cache(h)){
     case DATASTORE_NOCACHE:
         /* Read from file into created/copy tree, prune non-matching xpath 
@@ -1280,6 +1284,7 @@ xmldb_get0(clicon_handle    h,
         retval = xmldb_get_cache(h, db, yb, nsc, xpath, wdef, xret, msdiff, xerr);
         break;
     }
+ done:
     return retval;
 }
 
diff --git a/test/test_openconfig_network_instance.sh b/test/test_openconfig_network_instance.sh
index 8ff11489..2936d6c0 100755
--- a/test/test_openconfig_network_instance.sh
+++ b/test/test_openconfig_network_instance.sh
@@ -81,7 +81,6 @@ cat <<EOF > $dir/startup_db
       <config>
          <name>default</name>
          <type xmlns:oc-ni-types="http://openconfig.net/yang/network-instance-types">oc-ni-types:DEFAULT_INSTANCE</type>
-         <enabled>true</enabled>
          <router-id>1.2.3.4</router-id>
       </config>
     </network-instance>