Browse Source

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>
Yousong Zhou 9 years ago
parent
commit
19e29ffc15
1 changed files with 4 additions and 2 deletions
  1. 4 2
      delta.c

+ 4 - 2
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;
 }