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

memleaks

Browse source
This commit is contained in:
Olof Hagsand 2019-05-22 18:27:53 +00:00
parent 7e109d1d4b
commit a7af7e7593
4 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/src/clixon_xml.c
View file

@ -917,9 +917,10 @@ xml_wrap_all(cxobj *xp,
/*! Wrap a new element above a single xml node (xc) with new tag
* Before: xp --> xc # specific child (xp can be NULL)
* After: xp --> xt(tag) --> xc
* @param[in] xp Parent xml node
* @param[in] tag Name of new xml child
* @retval xc Return the new child (xc)
* @param[in] xp Parent xml node
* @param[in] tag Name of new xml child
* @retval NULL Error
* @retval xc Return the new child (xc)
* @see xml_addsub (give the parent)
* @see xml_wrap_all (wrap all children of a node, not just one)
*/
@ -1038,7 +1039,7 @@ xml_rm(cxobj *xc)
return retval;
}
/*! Return a child sub-tree, while removing parent and all other children
/*! Remove top XML object and all children except a single child
* Given a root xml node, and the i:th child, remove the child from its parent
* and return it, remove the parent and all other children. (unwrap)
* Before: xp-->[..xc..]
@ -1086,7 +1087,7 @@ xml_rootchild(cxobj *xp,
return retval;
}
/*! Return a child sub-tree, while removing parent and all other children
/*! Remove top XML object and all children except a single (given) child
* Given a root xml node, remove the child from its parent
* , remove the parent and all other children. (unwrap)
* Before: xp-->[..xc..]

22
lib/src/clixon_yang_module.c
View file

@ -287,7 +287,7 @@ yang_modules_state_get(clicon_handle h,
int retval = -1;
cxobj *x = NULL; /* Top tree, some juggling w top symbol */
char *msid; /* modules-set-id */
cxobj *x1;
cxobj *xc; /* original cache */
cbuf *cb = NULL;
int ret;
cxobj **xvec = NULL;
@ -295,20 +295,18 @@ yang_modules_state_get(clicon_handle h,
int i;
msid = clicon_option_str(h, "CLICON_MODULE_SET_ID");
if ((x = clicon_modst_cache_get(h, brief)) != NULL){
/* x is here: <modules-state>...
* and x is original tree, need to copy */
if ((x = xml_wrap(x, "top")) < 0)
if ((xc = clicon_modst_cache_get(h, brief)) != NULL){
cxobj *xw; /* tmp top wrap object */
/* xc is here: <modules-state>...
* need to wrap it for xpath: <top><modules-state> */
/* xc is also original tree, need to copy it */
if ((xw = xml_wrap(xc, "top")) == NULL)
goto done;
if (xpath_first(x, "%s", xpath)){
if ((x1 = xml_dup(x)) == NULL)
if (xpath_first(xw, "%s", xpath)){
if ((x = xml_dup(xc)) == NULL) /* Make copy and use below */
goto done;
x = x1;
}
else
x = NULL;
/* unwrap */
if (x && xml_rootchild(x, 0, &x) < 0)
if (xml_rootchild_node(xw, xc) < 0) /* Unwrap x / free xw */
goto done;
}
else { /* No cache -> build the tree */