fixes as per @michalvasko

Author: bradh352

src/plugins_types/union.c

@@ -150,17 +150,26 @@ lyb_parse_union(const void *lyb_data, size_t lyb_data_len, uint32_t *type_idx, c
     }
 }
 
+/**
+ * @brief For leafref failures, ensure the appropriate error is propagated, not a type validation failure.
+ *
+ * @param[in] ctx_node Context node for prefix resolution.
+ * @param[in,out] err Error record to be updated
+ * @param[in] type leafref type used to extract target path
+ * @param[in] value value attempting to be stored
+ * @param[in] value_len Length of value that was attempted to be stored.
+ */
 static void
-union_lref_error_rewrite(const struct lyd_node *ctx_node, struct ly_err_item *err, struct lysc_type *type, const void *value, size_t value_len)
+union_update_lref_err(const struct lyd_node *ctx_node, struct ly_err_item *err, const struct lysc_type *type, const void *value, size_t value_len)
 {
-    struct lysc_type_leafref *lref;
+    const struct lysc_type_leafref *lref;
     char *valstr = NULL;
 
     if ((err == NULL) || (type->basetype != LY_TYPE_LEAFREF)) {
         return;
     }
 
-    lref = (struct lysc_type_leafref *)type;
+    lref = (const struct lysc_type_leafref *)type;
     free(err->apptag);
     err->apptag = strdup("instance-required");
 
@@ -217,7 +226,7 @@ union_store_type(const struct ly_ctx *ctx, struct lysc_type_union *type_u, uint3
                 memset(&subvalue->value, 0, sizeof subvalue->value);
 
                 /* if this is a leafref, lets make sure we propagate the appropriate error, and not a type validation failure */
-                union_lref_error_rewrite(ctx_node, *err, type_u->types[ti], value, value_len);
+                union_update_lref_err(ctx_node, *err, type_u->types[ti], value, value_len);
                 return rc;
             }
 
@@ -258,9 +267,7 @@ union_store_type(const struct ly_ctx *ctx, struct lysc_type_union *type_u, uint3
         memset(&subvalue->value, 0, sizeof subvalue->value);
 
         /* if this is a leafref, lets make sure we propagate the appropriate error, and not a type validation failure */
-        if (type->basetype == LY_TYPE_LEAFREF) {
-            union_lref_error_rewrite(ctx_node, *err, type, value, value_len);
-        }
+        union_update_lref_err(ctx_node, *err, type, value, value_len);
         return rc;
     }