|
 |
67d7dc |
From 4ae130455b173650f564d92f7908a7ca4f7b1ee6 Mon Sep 17 00:00:00 2001
|
|
|
67d7dc |
From: Gopal Tiwari <gtiwari@redhat.com>
|
|
|
67d7dc |
Date: Tue, 31 May 2022 13:11:10 +0530
|
|
|
67d7dc |
Subject: [PATCH BlueZ 06/12] create-image: Fix leaked_handle
|
|
|
67d7dc |
|
|
|
67d7dc |
While performing static tool analysis using coverity found following
|
|
|
67d7dc |
reports for resouse leak
|
|
|
67d7dc |
|
|
|
67d7dc |
bluez-5.64/tools/create-image.c:124: leaked_storage: Variable "map"
|
|
|
67d7dc |
going out of scope leaks the storage it points to.
|
|
|
67d7dc |
---
|
|
|
67d7dc |
tools/create-image.c | 7 +++----
|
|
|
67d7dc |
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
67d7dc |
|
|
|
67d7dc |
diff --git a/tools/create-image.c b/tools/create-image.c
|
|
|
67d7dc |
index aba940da7..90cd87315 100644
|
|
|
67d7dc |
--- a/tools/create-image.c
|
|
|
67d7dc |
+++ b/tools/create-image.c
|
|
|
67d7dc |
@@ -97,12 +97,13 @@ static void write_block(FILE *fp, const char *pathname, unsigned int ino,
|
|
|
67d7dc |
|
|
|
67d7dc |
map = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
|
|
|
67d7dc |
if (!map || map == MAP_FAILED) {
|
|
|
67d7dc |
- close(fd);
|
|
|
67d7dc |
- fd = -1;
|
|
|
67d7dc |
map = NULL;
|
|
|
67d7dc |
st.st_size = 0;
|
|
|
67d7dc |
}
|
|
|
67d7dc |
|
|
|
67d7dc |
+ close(fd);
|
|
|
67d7dc |
+ fd = -1;
|
|
|
67d7dc |
+
|
|
|
67d7dc |
done:
|
|
|
67d7dc |
fprintf(fp, HDR_FMT, HDR_MAGIC, ino, mode, 0, 0, 1, 0,
|
|
|
67d7dc |
(uintmax_t) st.st_size, 0, 0, 0, 0, namelen + 1, 0, name);
|
|
|
67d7dc |
@@ -117,9 +118,7 @@ done:
|
|
|
67d7dc |
pad = 3 - ((st.st_size + 3) % 4);
|
|
|
67d7dc |
for (i = 0; i < pad; i++)
|
|
|
67d7dc |
fputc(0, fp);
|
|
|
67d7dc |
-
|
|
|
67d7dc |
munmap(map, st.st_size);
|
|
|
67d7dc |
- close(fd);
|
|
|
67d7dc |
}
|
|
|
67d7dc |
}
|
|
|
67d7dc |
|
|
|
67d7dc |
--
|
|
|
67d7dc |
2.26.2
|
|
|
67d7dc |
|