experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed: Double top-levels in xmldb_get that could occur with xpath containing choice.

Browse source
This commit is contained in:
Olof hagsand 2024-09-04 12:06:19 +02:00
parent a66fe05149
commit 31008e8492
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -55,6 +55,7 @@ Developers may need to change their code
### Corrected Busg ### Corrected Busg
* Fixed: Double top-levels in xmldb_get that could occur with xpath containing choice.
* Fixed: [RESTCONF exit on cert error + complex accept](https://github.com/clicon/clixon/issues/551) * Fixed: [RESTCONF exit on cert error + complex accept](https://github.com/clicon/clixon/issues/551)
* Fixed: [Deletion of leaf in YANG choice removes leaf in a different choice/case](https://github.com/clicon/clixon/issues/542) * Fixed: [Deletion of leaf in YANG choice removes leaf in a different choice/case](https://github.com/clicon/clixon/issues/542)
* Fixed: Deviated types were resolved in target context, not lexically in deviation context * Fixed: Deviated types were resolved in target context, not lexically in deviation context

8
lib/src/clixon_datastore_read.c
View file

@ -140,8 +140,12 @@ singleconfigroot(cxobj *xt,
/*! Recurse up from x0 up to x0t then create objects from x1t down to new object x1 /*! Recurse up from x0 up to x0t then create objects from x1t down to new object x1
* *
* @param[in] x0t Orig top-level
* @param[in] x0 Orig node (go up from this until = x0t)
* @param[in] x1t New tree on entry
* @param[out] x1pp
* @retval 0 OK * @retval 0 OK
* @retval -1 OK * @retval -1 Error
*/ */
static int static int
xml_copy_bottom_recurse(cxobj *x0t, xml_copy_bottom_recurse(cxobj *x0t,
@ -211,6 +215,8 @@ xml_copy_bottom_recurse(cxobj *x0t,
} }
} }
if (xml_sort(x1p) < 0)
goto done;
} }
*x1pp = x1; *x1pp = x1;
x1 = NULL; x1 = NULL;