Merge branch 'tickets/DM-48646'

lsst · Feb 3, 2025 · 0f409b1 · 0f409b1
2 parents 4776612 + 3d14871
commit 0f409b1
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/util/common.cc b/src/util/common.cc
@@ -53,6 +53,7 @@ string get_current_host_fqdn(bool all) {
     hints.ai_family = AF_UNSPEC;     /* either IPV4 or IPV6 */
     hints.ai_socktype = SOCK_STREAM; /* IP */
     hints.ai_flags = AI_CANONNAME;   /* canonical name */
+    hints.ai_canonname = NULL;
     struct addrinfo* info;
     while (true) {
         int const retCode = getaddrinfo(hostname.data(), "http", &hints, &info);
@@ -63,6 +64,10 @@ string get_current_host_fqdn(bool all) {
     }
     string fqdn;
     for (struct addrinfo* p = info; p != NULL; p = p->ai_next) {
+        if (p->ai_canonname == NULL) {
+            throw runtime_error("Registry::" + string(__func__) +
+                                " getaddrinfo failed: ai_canonname is NULL");
+        }
         if (!fqdn.empty()) {
             if (!all) break;
             fqdn += ",";