From 78adf4796e84f1b299270abd50dbf7343fb7f0b4 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 12 Jul 2021 18:08:28 +0200
Subject: [PATCH] cloud-setup: fix constructing URL from
 NM_CLOUD_SETUP_EC2_HOST in _ec2_base()

---
 src/nm-cloud-setup/nmcs-provider-ec2.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/nm-cloud-setup/nmcs-provider-ec2.c b/src/nm-cloud-setup/nmcs-provider-ec2.c
index 14b0b740ae..49777106b6 100644
--- a/src/nm-cloud-setup/nmcs-provider-ec2.c
+++ b/src/nm-cloud-setup/nmcs-provider-ec2.c
@@ -30,8 +30,9 @@ again:
          * Consider this private API! */
         base = g_getenv(NMCS_ENV_VARIABLE("NM_CLOUD_SETUP_EC2_HOST"));
 
-        if (base && base[0] && !strchr(base, '/')) {
-            if (NM_STR_HAS_PREFIX(base, "http://") || NM_STR_HAS_PREFIX(base, "https://"))
+        if (!nm_str_is_empty(base)) {
+            if (NM_STR_HAS_PREFIX(base, "http://") || NM_STR_HAS_PREFIX(base, "https://")
+                || strchr(base, '/'))
                 base = g_intern_string(base);
             else {
                 gs_free char *s = NULL;
@@ -40,7 +41,7 @@ again:
                 base = g_intern_string(s);
             }
         }
-        if (!base)
+        if (nm_str_is_empty(base))
             base = NM_EC2_BASE;
 
         nm_assert(!NM_STR_HAS_SUFFIX(base, "/"));