X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=delta.c;h=e9c79ab5be07b80058869b8a4ba69c04cee3de44;hb=19e29ffc15dbd958e8e6a648ee0982c68353516f;hp=459d2c7ddfd5d4443c24c02a76952d40319bb871;hpb=a6a884b368409c0c0af1c1c53f6ad4a1b55648b2;p=project%2Fuci.git diff --git a/delta.c b/delta.c index 459d2c7..e9c79ab 100644 --- a/delta.c +++ b/delta.c @@ -293,13 +293,15 @@ static int uci_load_delta_file(struct uci_context *ctx, struct uci_package *p, c UCI_TRAP_SAVE(ctx, done); stream = uci_open_stream(ctx, filename, NULL, SEEK_SET, flush, false); + UCI_TRAP_RESTORE(ctx); + if (p) changes = uci_parse_delta(ctx, stream, p); - UCI_TRAP_RESTORE(ctx); + done: if (f) *f = stream; - else if (stream) + else uci_close_stream(stream); return changes; }