summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2023-03-02 21:49:36 +0000
committerGitHub <noreply@github.com>2023-03-02 21:49:36 +0000
commitda63f2bddb9ce58e0844ac415d4cba388571e1f4 (patch)
tree3a17d93bebda0f0acfc2b05f0b84341ac0de8670
parent1a70cbe8e8eb150ce919fd3b0cfaf68ee2ec32a4 (diff)
parent7ef02842ebde3c88c04dac7cee707b8c581332bc (diff)
downloadbubblewrap-da63f2bddb9ce58e0844ac415d4cba388571e1f4.tar.gz
Merge pull request #558 from cgzones/close
load_file_data: do not close fd on error to avoid double-close
-rw-r--r--utils.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/utils.c b/utils.c
index 693273b..b2e885f 100644
--- a/utils.c
+++ b/utils.c
@@ -568,7 +568,6 @@ load_file_data (int fd,
ssize_t data_read;
ssize_t data_len;
ssize_t res;
- int errsv;
data_read = 0;
data_len = 4080;
@@ -587,12 +586,7 @@ load_file_data (int fd,
while (res < 0 && errno == EINTR);
if (res < 0)
- {
- errsv = errno;
- close (fd);
- errno = errsv;
- return NULL;
- }
+ return NULL;
data_read += res;
}