From b82c9c97efa66668de172ad04deb83c9675f6a97 Mon Sep 17 00:00:00 2001 From: Petri Latvala Date: Tue, 2 Oct 2018 10:45:41 +0300 Subject: runner: Plug more fd leaks Signed-off-by: Petri Latvala Cc: Arkadiusz Hiler Reviewed-by: Arkadiusz Hiler --- runner/resultgen.c | 4 ++++ runner/runner_tests.c | 2 ++ 2 files changed, 6 insertions(+) (limited to 'runner') diff --git a/runner/resultgen.c b/runner/resultgen.c index 11eff9d3..9fc54cdc 100644 --- a/runner/resultgen.c +++ b/runner/resultgen.c @@ -809,6 +809,7 @@ static void fill_from_journal(int fd, } free(line); + fclose(f); } static void override_result_single(struct json_object *obj) @@ -1073,13 +1074,16 @@ bool generate_results(int dirfd) } if (!parse_test_directory(testdirfd, &job_list.entries[i], &settings, &results)) { + close(testdirfd); close(resultsfd); return false; } + close(testdirfd); } json_string = json_object_to_json_string_ext(obj, JSON_C_TO_STRING_PRETTY); write(resultsfd, json_string, strlen(json_string)); + close(resultsfd); return true; } diff --git a/runner/runner_tests.c b/runner/runner_tests.c index b03f2acf..3705d711 100644 --- a/runner/runner_tests.c +++ b/runner/runner_tests.c @@ -50,6 +50,8 @@ static char *dump_file(int dirfd, char *name) } s = read(fd, buf, 255); + close(fd); + if (s < 0) { free(buf); return NULL; -- cgit v1.2.3