summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2013-09-29 13:11:37 +0000
committerJo-Philipp Wich <jow@openwrt.org>2013-09-29 13:11:37 +0000
commit095b1058c8cb1147d11028974be4067009bcfd67 (patch)
tree0651a835f2cd7083dbf7b7db89945c69c2818e08
parenta23010d4072f01aa525e99f726ce49792c908473 (diff)
downloadrpcd-095b1058c8cb1147d11028974be4067009bcfd67.tar.gz
uci: clear ptr.value in rpc_uci_merge_set(), this fixes missing delete deltas if multiple options are merged
-rw-r--r--uci.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/uci.c b/uci.c
index a133ff2..060ed2b 100644
--- a/uci.c
+++ b/uci.c
@@ -682,6 +682,7 @@ rpc_uci_merge_set(struct blob_attr *opt, struct uci_ptr *ptr)
ptr->o = NULL;
ptr->option = blobmsg_name(opt);
+ ptr->value = NULL;
if (rpc_uci_lookup(ptr) || !ptr->s)
return;