From: Luca Boccassi <bluca@debian.org>
Date: Fri, 20 May 2022 11:05:34 +0000 (+0100)
Subject: dissect: ID from os-release should be non-empty, not just non-NULL
X-Git-Tag: v251~6^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a2cf73f0b602a93a32107cfc066a5e307263c577;p=thirdparty%2Fsystemd.git

dissect: ID from os-release should be non-empty, not just non-NULL
---

diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index 5b0b12a2658..1ab88839aac 100644
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -3157,7 +3157,7 @@ int verity_dissect_and_mount(
          * First, check the distro ID. If that matches, then check the new SYSEXT_LEVEL value if
          * available, or else fallback to VERSION_ID. If neither is present (eg: rolling release),
          * then a simple match on the ID will be performed. */
-        if (required_host_os_release_id) {
+        if (!isempty(required_host_os_release_id)) {
                 _cleanup_strv_free_ char **extension_release = NULL;
 
                 r = load_extension_release_pairs(dest, dissected_image->image_name, &extension_release);