From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Fri, 1 Nov 2019 11:02:13 +0000 (+0100)
Subject: util: Fix error path
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2c8e4a347bb68229937ceda6e099fb10e9b792d1;p=oweals%2Fuci.git

util: Fix error path

Unlock and close the stream in case some file operations in
uci_open_stream() fail.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/util.c b/util.c
index 12aec9b..8572e81 100644
--- a/util.c
+++ b/util.c
@@ -221,17 +221,21 @@ __private FILE *uci_open_stream(struct uci_context *ctx, const char *filename, c
 
 	ret = flock(fd, (write ? LOCK_EX : LOCK_SH));
 	if ((ret < 0) && (errno != ENOSYS))
-		goto error;
+		goto error_close;
 
 	ret = lseek(fd, 0, pos);
 
 	if (ret < 0)
-		goto error;
+		goto error_unlock;
 
 	file = fdopen(fd, (write ? "w+" : "r"));
 	if (file)
 		goto done;
 
+error_unlock:
+	flock(fd, LOCK_UN);
+error_close:
+	close(fd);
 error:
 	UCI_THROW(ctx, UCI_ERR_IO);
 done: