mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-31 06:16:03 +00:00
Code Issues Releases Wiki Activity

Use the gcc cleanup extension attribute to handle closing temp files

Browse Source 
While some of these allocations will go away as we convert to C++,
some of these need to stay C as the are going to be moved into a
library to support loading cache from init daemons etc.

For the bits that will eventually be C++ this helps clean things up,
in the interim.

TODO: apply to libapparmor as well

Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Tyler Hicks <tyhicks@canonical.com>
This commit is contained in:
John Johansen
2015-03-25 17:09:26 -05:00
committed by Tyler Hicks
parent 82904cf0e6
commit f62cc5c6bf
8 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
parser/parser_interface.c
View File

@@ -479,7 +479,7 @@ void sd_serialize_top_profile(std::ostringstream &buf, Profile *profile)
int cache_fd = -1;
int __sd_serialize_profile(int option, Profile *prof)
{
int fd = -1;
autoclose int fd = -1;
int error = -ENOMEM, size, wsize;
std::ostringstream work_area;
autofree char *filename = NULL;
@@ -594,9 +594,6 @@ int __sd_serialize_profile(int option, Profile *prof)
}
}
if (fd != -1)
close(fd);
if (!prof->hat_table.empty() && option != OPTION_REMOVE) {
if (load_flattened_hats(prof, option) == 0)
return 0;
@@ -641,7 +638,7 @@ static int write_buffer(int fd, char *buffer, int size, bool set)
int sd_load_buffer(int option, char *buffer, int size)
{
int fd = -1;
autoclose int fd = -1;
int error, bsize;
autofree char *filename = NULL;
@@ -666,8 +663,7 @@ int sd_load_buffer(int option, char *buffer, int size)
if (fd < 0) {
PERROR(_("Unable to open %s - %s\n"), filename,
strerror(errno));
error = -errno;
goto out;
return -errno;
}
if (kernel_supports_setload) {
@@ -688,8 +684,6 @@ int sd_load_buffer(int option, char *buffer, int size)
break;
}
}
close(fd);
out:
return error;
}