X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=delta.c;h=e9c79ab5be07b80058869b8a4ba69c04cee3de44;hp=459d2c7ddfd5d4443c24c02a76952d40319bb871;hb=950437eecd6048dd29eb3e11f4343372b2ddce60;hpb=13d32e6df1c3949459c8821b7a03ec13d92e9bf1 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; }