From 273cb07d1b38061f816ccac23fd583e9252430fd Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 15 Jan 2021 21:23:20 +0100 Subject: [PATCH] import: small memory management simplification --- src/import/pull-job.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/import/pull-job.c b/src/import/pull-job.c index b5fb0193ec1..f41a7e7a5d0 100644 --- a/src/import/pull-job.c +++ b/src/import/pull-job.c @@ -434,10 +434,9 @@ fail: } static size_t pull_job_header_callback(void *contents, size_t size, size_t nmemb, void *userdata) { + _cleanup_free_ char *length = NULL, *last_modified = NULL, *etag = NULL; PullJob *j = userdata; size_t sz = size * nmemb; - _cleanup_free_ char *length = NULL, *last_modified = NULL; - char *etag; int r; assert(contents); @@ -456,8 +455,7 @@ static size_t pull_job_header_callback(void *contents, size_t size, size_t nmemb goto fail; } if (r > 0) { - free(j->etag); - j->etag = etag; + free_and_replace(j->etag, etag); if (strv_contains(j->old_etags, j->etag)) { log_info("Image already downloaded. Skipping download."); -- 2.47.3