From b3fae863ef548add2d01c3956ce7720f4eeeca7e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 14 Jan 2015 22:31:03 +0100 Subject: [PATCH 1/1] sysv-generator: fix memory leak on failure This fixes a memory leak introduced by 1ed0c19f81fd13cdf283c6def0168ce122a853a9 --- src/sysv-generator/sysv-generator.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c index 2f24ef256..89c0e7c67 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -755,13 +755,11 @@ static int enumerate_sysv(LookupPaths lp, Hashmap *all_services) { service->name = name; service->path = fpath; - r = load_sysv(service); - if (r < 0) - continue; - r = hashmap_put(all_services, service->name, service); - if (r < 0) + if (r < 0) { + free(service); return log_oom(); + } name = fpath = NULL; } @@ -942,6 +940,12 @@ int main(int argc, char *argv[]) { return EXIT_FAILURE; } + HASHMAP_FOREACH(service, all_services, j) { + q = load_sysv(service); + if (q < 0) + continue; + } + HASHMAP_FOREACH(service, all_services, j) { q = fix_order(service, all_services); if (q < 0) -- 2.30.2