X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=file.c;h=d320ba6c3cd66d49bd708d0756826c80511f3548;hp=29ff3189a4c0c7c93c39de8bcb4b98914adf48a2;hb=2a3ffb0a3f38d814ae3b9cb7e7fa868218b45423;hpb=5dd8939426e9f846be40e87b4924f0ec59382baf

diff --git a/file.c b/file.c
index 29ff318..d320ba6 100644
--- 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: