From c9816a9ac417c9a076cc11eb469b00b2eb98d572 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 4 May 2021 19:10:15 +0200 Subject: [PATCH] basic/time-util: use _cleanup_ in one more place --- src/basic/time-util.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/basic/time-util.c b/src/basic/time-util.c index 78d0390a00c..6b3b42254d5 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c @@ -1278,8 +1278,8 @@ int get_timezones(char ***ret) { f = fopen("/usr/share/zoneinfo/zone1970.tab", "re"); if (f) { for (;;) { - _cleanup_free_ char *line = NULL; - char *p, *w; + _cleanup_free_ char *line = NULL, *w = NULL; + char *p; size_t k; r = read_line(f, LONG_LINE_MAX, &line); @@ -1310,12 +1310,10 @@ int get_timezones(char ***ret) { if (!w) return -ENOMEM; - if (!GREEDY_REALLOC(zones, n_allocated, n_zones + 2)) { - free(w); + if (!GREEDY_REALLOC(zones, n_allocated, n_zones + 2)) return -ENOMEM; - } - zones[n_zones++] = w; + zones[n_zones++] = TAKE_PTR(w); zones[n_zones] = NULL; } -- 2.47.3