shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-08-02 04:22:45 +03:00
Code Activity

dbus1-generator: properly free the FILE*

Browse Source 
Also, rework the code to make use of fflush_and_check().

Issue discovered by Simon Danner.
This commit is contained in:
Lennart Poettering
2014-08-22 12:44:17 +02:00
parent 337ce7442a
commit 0975b63fb3
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/dbus1-generator/dbus1-generator.c
View File

@ -40,6 +40,7 @@ static int create_dbus_files(
_cleanup_free_ char *b = NULL, *s = NULL, *lnk = NULL;
_cleanup_fclose_ FILE *f = NULL;
int r;
assert(path);
assert(name);
@ -100,12 +101,15 @@ static int create_dbus_files(
}
}
fflush(f);
if (ferror(f)) {
log_error("Failed to write %s: %m", a);
return -errno;
r = fflush_and_check(f);
if (r < 0) {
log_error("Failed to write %s: %s", a, strerror(-r));
return r;
}
fclose(f);
f = NULL;
service = s;
}
@ -134,10 +138,10 @@ static int create_dbus_files(
name,
service);
fflush(f);
if (ferror(f)) {
log_error("Failed to write %s: %m", b);
return -errno;
r = fflush_and_check(f);
if (r < 0) {
log_error("Failed to write %s: %s", b, strerror(-r));
return r;
}
lnk = strjoin(arg_dest_late, "/" SPECIAL_BUSNAMES_TARGET ".wants/", name, ".busname", NULL);