temp

Author: Humblesaw

src/tree_data.c

@@ -279,6 +279,8 @@ lyd_parse_data_path(const struct ly_ctx *ctx, const char *path, LYD_FORMAT forma
     return ret;
 }
 
+static int lyd_insert_has_keys(const struct lyd_node *list);
+
 LIBYANG_API_DEF LY_ERR
 lyd_parse_value_fragment(const struct ly_ctx *ctx, const char *path, struct ly_in *in, LYD_FORMAT format,
         uint32_t new_val_options, uint32_t parse_options, uint32_t validate_options, struct lyd_node **tree)
@@ -289,7 +291,7 @@ lyd_parse_value_fragment(const struct ly_ctx *ctx, const char *path, struct ly_i
     struct lyd_node *new_last_parent = NULL, *new_top_parent = NULL;
     const struct lysc_node *new_node_schema = NULL;
     ly_bool p_decremented = 0;
-    struct lyd_node *iter = NULL;
+    struct lyd_node *iter = NULL, *parent = NULL;
     const char *key_value = NULL;
     const char *path_key_value = NULL;
 
@@ -341,20 +343,20 @@ lyd_parse_value_fragment(const struct ly_ctx *ctx, const char *path, struct ly_i
                     LY_CHECK_ERR_GOTO(strcmp(key_value, path_key_value), LOGVAL(ctx, LYVE_DATA,
                             "Path [%s] contains a different key [%s] than data [%s]", path, path_key_value, key_value);
                             ret = LY_EINVAL, cleanup);
+                    parent = lyd_parent(iter);
                     lyd_unlink(iter);
                     lyd_free_tree(iter);
 
                     /* when unlinking duplicate key we need to recalculate the list hash */
-                    if (iter->schema && (iter->schema->flags & LYS_KEY) && iter->parent->schema &&
-                            lyd_insert_has_keys(lyd_parent(iter))) {
+                    if (parent && parent->schema && lyd_insert_has_keys(parent)) {
                         /* unlink the list instance */
-                        lyd_unlink_hash(lyd_parent(iter));
+                        lyd_unlink_hash(parent);
 
                         /* calculate updated instance hash */
-                        lyd_hash(lyd_parent(iter));
+                        lyd_hash(parent);
 
                         /* reinsert list into its parent HT */
-                        lyd_insert_hash(lyd_parent(iter));
+                        lyd_insert_hash(parent);
                     }
                     break;
                 }