shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-05 23:51:28 +03:00
Code

core/path: fix a leak in success path

Browse Source 
... and use automatic cleanup.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-03-01 17:44:25 -05:00
parent b8fe3faf9f
commit f8c16f42fb
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/path.c
View File

@ -33,6 +33,7 @@
#include "special.h" #include "special.h"
#include "bus-errors.h" #include "bus-errors.h"
#include "path-util.h" #include "path-util.h"
#include "macro.h"
static const UnitActiveState state_translation_table[_PATH_STATE_MAX] = { static const UnitActiveState state_translation_table[_PATH_STATE_MAX] = {
[PATH_DEAD] = UNIT_INACTIVE, [PATH_DEAD] = UNIT_INACTIVE,
@ -52,7 +53,8 @@ int path_spec_watch(PathSpec *s, Unit *u) {
}; };
bool exists = false; bool exists = false;
char *k, *slash; char _cleanup_free_ *k = NULL;
char *slash;
int r; int r;
assert(u); assert(u);
@ -60,18 +62,19 @@ int path_spec_watch(PathSpec *s, Unit *u) {
path_spec_unwatch(s, u); path_spec_unwatch(s, u);
if (!(k = strdup(s->path))) k = strdup(s->path);
if (!k)
return -ENOMEM; return -ENOMEM;
if ((s->inotify_fd = inotify_init1(IN_NONBLOCK|IN_CLOEXEC)) < 0) { s->inotify_fd = inotify_init1(IN_NONBLOCK|IN_CLOEXEC);
if (s->inotify_fd < 0) {
r = -errno; r = -errno;
goto fail; goto fail;
} }
if (unit_watch_fd(u, s->inotify_fd, EPOLLIN, &s->watch) < 0) { r = unit_watch_fd(u, s->inotify_fd, EPOLLIN, &s->watch);
r = -errno; if (r < 0)
goto fail; goto fail;
}
s->primary_wd = inotify_add_watch(s->inotify_fd, k, flags_table[s->type]); s->primary_wd = inotify_add_watch(s->inotify_fd, k, flags_table[s->type]);
if (s->primary_wd >= 0) if (s->primary_wd >= 0)
@ -99,8 +102,6 @@ int path_spec_watch(PathSpec *s, Unit *u) {
return 0; return 0;
fail: fail:
free(k);
path_spec_unwatch(s, u); path_spec_unwatch(s, u);
return r; return r;
} }