improve error handling

diff --git a/file.c b/file.c
index 29ff3189a4c0c7c93c39de8bcb4b98914adf48a2..d320ba6c3cd66d49bd708d0756826c80511f3548 100644 (file)
--- a/file.c
+++ b/file.c
@@ -122,7 +122,8 @@ static void uci_parse_config(struct uci_context *ctx, char **str)
 
        if (pctx->merge) {
                UCI_TRAP_SAVE(ctx, error);
-               uci_set(ctx, pctx->package, name, NULL, type, NULL);
+               if (uci_set(ctx, pctx->package, name, NULL, type, NULL) != UCI_OK)
+                       goto error;
                UCI_TRAP_RESTORE(ctx);
                return;
 error: