From 7533a33b0ce2171f6d9d965afa0b1e84f597f1d0 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 8 Mar 2021 17:31:35 +0100 Subject: [PATCH 1/2] dissect-image: remove unnecessary parens --- src/shared/dissect-image.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c index 55a0c9525c..aeaa1061fb 100644 --- a/src/shared/dissect-image.c +++ b/src/shared/dissect-image.c @@ -2250,8 +2250,8 @@ int dissected_image_acquire_metadata(DissectedImage *m) { [META_HOSTNAME] = "/etc/hostname\0", [META_MACHINE_ID] = "/etc/machine-id\0", [META_MACHINE_INFO] = "/etc/machine-info\0", - [META_OS_RELEASE] = ("/etc/os-release\0" - "/usr/lib/os-release\0"), + [META_OS_RELEASE] = "/etc/os-release\0" + "/usr/lib/os-release\0", [META_EXTENSION_RELEASE] = NULL, }; From 794a579f2932340adfc34a8cf55ac25656c3461d Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 8 Mar 2021 17:31:47 +0100 Subject: [PATCH 2/2] dissect-image: don#t mix two forms of stack allocation in one expression It's not necessarily safe to do this, hence don't. --- src/shared/dissect-image.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c index aeaa1061fb..32fff8165b 100644 --- a/src/shared/dissect-image.c +++ b/src/shared/dissect-image.c @@ -2272,7 +2272,9 @@ int dissected_image_acquire_metadata(DissectedImage *m) { /* As per the os-release spec, if the image is an extension it will have a file * named after the image name in extension-release.d/ */ if (m->image_name) { - char *ext = strjoina("/usr/lib/extension-release.d/extension-release.", m->image_name, "0"); + char *ext; + + ext = strjoina("/usr/lib/extension-release.d/extension-release.", m->image_name, "0"); ext[strlen(ext) - 1] = '\0'; /* Extra \0 for NULSTR_FOREACH using placeholder from above */ paths[META_EXTENSION_RELEASE] = ext; } else