From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 8 Mar 2021 16:31:47 +0000 (+0100)
Subject: dissect-image: don#t mix two forms of stack allocation in one expression
X-Git-Tag: v248-rc3~26^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F18927%2Fhead;p=thirdparty%2Fsystemd.git

dissect-image: don#t mix two forms of stack allocation in one expression

It's not necessarily safe to do this, hence don't.
---

diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index aeaa1061fbc..32fff8165bd 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