Merge pull request #9861 from ymartin-ovh/issue-9752

icinga2: address comment loading where host reference is not found
Icinga · Jan 7, 2025 · 880632b · 880632b
2 parents 9a000f3 + d9e3a9c
commit 880632b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/AUTHORS b/AUTHORS
@@ -300,6 +300,7 @@ Winfried Angele <[email protected]>
 Wolfgang Nieder <[email protected]>
 XnS <[email protected]>
 Yannick Charton <[email protected]>
+Yannick Martin <[email protected]>
 Yohan Jarosz <[email protected]>
 Yonas Habteab <[email protected]>
 Zachary McGibbon <[email protected]>

diff --git a/lib/icinga/comment.cpp b/lib/icinga/comment.cpp
@@ -65,7 +65,7 @@ void Comment::OnAllConfigLoaded()
 
 	Host::Ptr host = Host::GetByName(GetHostName());
 
-	if (GetServiceName().IsEmpty())
+	if (GetServiceName().IsEmpty() || ! host)
 		m_Checkable = host;
 	else
 		m_Checkable = host->GetServiceByShortName(GetServiceName());