From: Yousong Zhou <yszhou4tech@gmail.com>
Date: Mon, 25 May 2015 12:32:41 +0000 (+0800)
Subject: delta: catch error when parsing delta line.
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=commitdiff_plain;h=19e29ffc15dbd958e8e6a648ee0982c68353516f;hp=a6a884b368409c0c0af1c1c53f6ad4a1b55648b2

delta: catch error when parsing delta line.

Reported by sarumpaet [1]

 [1] uci fails to handle long values properly,
     https://github.com/openwrt/packages/issues/1231

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
---

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;
 }