DGNum/rpcd
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

uci: refactor revert code to avoid illegal pointer access

Browse source
This commit is contained in:
Jo-Philipp Wich 2013-08-12 14:49:02 +02:00
parent c2a7fcf947
commit 97384dd72a
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
uci.c
View file

@ -1021,19 +1021,22 @@ rpc_uci_revert_commit(struct blob_attr *msg, bool commit)
return UBUS_STATUS_PERMISSION_DENIED; return UBUS_STATUS_PERMISSION_DENIED;
ptr.package = blobmsg_data(tb[RPC_C_CONFIG]); ptr.package = blobmsg_data(tb[RPC_C_CONFIG]);
uci_load(cursor, ptr.package, &p);
if (!p || uci_lookup_ptr(cursor, &ptr, NULL, true) || !ptr.p)
goto out;
if (commit) if (commit)
uci_commit(cursor, &p, false); {
else uci_load(cursor, ptr.package, &p);
uci_revert(cursor, &ptr);
out: if (p)
if (p) {
uci_unload(cursor, p); uci_commit(cursor, &p, false);
uci_unload(cursor, p);
}
}
else
{
if (!uci_lookup_ptr(cursor, &ptr, NULL, true) && ptr.p)
uci_revert(cursor, &ptr);
}
return rpc_uci_status(); return rpc_uci_status();
} }