diff mbox

[OpenWrt-Devel,2/4] delta: catch error when parsing delta line.

Message ID 1432557163-17492-3-git-send-email-yszhou4tech@gmail.com
State Accepted
Headers show

Commit Message

Yousong Zhou May 25, 2015, 12:32 p.m. UTC 
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>
---
 delta.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
diff mbox

Patch

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