tree data BUGFIX inserting nested ext-inst data (#2420)

Humblesaw · web-flow · commit 74de8c1e7034 · 2025-09-01T11:33:18.000+02:00
Co-authored-by: Humblesaw &lt;kusnirik@cesnet.cz&gt;
diff --git a/src/tree_data.c b/src/tree_data.c
@@ -688,7 +688,7 @@ lyd_insert_node_find_anchor(struct lyd_node *first_sibling, struct lyd_node *nod
 {
     struct lyd_node *anchor;
 
-    if (first_sibling && (first_sibling->flags & LYD_EXT)) {
+    if ((node->flags & LYD_EXT) && (!first_sibling || !(first_sibling->prev->flags & LYD_EXT))) {
         return NULL;
     }
 
@@ -767,7 +767,7 @@ lyd_insert_node(struct lyd_node *parent, struct lyd_node **first_sibling_p, stru
     }
     first_sibling = parent ? lyd_child(parent) : *first_sibling_p;
 
-    if ((order == LYD_INSERT_NODE_LAST) || !node->schema || (first_sibling && (first_sibling->flags & LYD_EXT))) {
+    if ((order == LYD_INSERT_NODE_LAST) || !node->schema) {
         lyd_insert_node_last(parent, &first_sibling, node);
     } else if (order == LYD_INSERT_NODE_LAST_BY_SCHEMA) {
         lyd_insert_node_ordby_schema(parent, &first_sibling, node);

Original file line number	Diff line number	Diff line change
`@@ -688,7 +688,7 @@ lyd_insert_node_find_anchor(struct lyd_node first_sibling, struct lyd_node nod`
`688`	`688`	`{`
`689`	`689`	`struct lyd_node *anchor;`
`690`	`690`
`691`		`- if (first_sibling && (first_sibling->flags & LYD_EXT)) {`
	`691`	`+ if ((node->flags & LYD_EXT) && (!first_sibling \|\| !(first_sibling->prev->flags & LYD_EXT))) {`
`692`	`692`	`return NULL;`
`693`	`693`	`}`
`694`	`694`
`@@ -767,7 +767,7 @@ lyd_insert_node(struct lyd_node parent, struct lyd_node *first_sibling_p, stru`
`767`	`767`	`}`
`768`	`768`	`first_sibling = parent ? lyd_child(parent) : *first_sibling_p;`
`769`	`769`
`770`		`- if ((order == LYD_INSERT_NODE_LAST) \|\| !node->schema \|\| (first_sibling && (first_sibling->flags & LYD_EXT))) {`
	`770`	`+ if ((order == LYD_INSERT_NODE_LAST) \|\| !node->schema) {`
`771`	`771`	`lyd_insert_node_last(parent, &first_sibling, node);`
`772`	`772`	`} else if (order == LYD_INSERT_NODE_LAST_BY_SCHEMA) {`
`773`	`773`	`lyd_insert_node_ordby_schema(parent, &first_sibling, node);`