From 0276c0b052c3143707d79be4eff2d69f19849c40 Mon Sep 17 00:00:00 2001 From: Julian Brost Date: Thu, 7 Jan 2021 17:23:29 +0100 Subject: [PATCH] Properly handle service downtime referencing a deleted host Only two out of three cases were handled properly by the code: host downtimes referencing a deleted host and service downtimes referencing a deleted service worked fine. However, if a service downtime references a deleted host, `Host::GetByName()` returns `nullptr` which isn't accounted for. Use `Service::GetByNamePair()` instead as this performs a check for the host being null internally. --- lib/icinga/downtime.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/icinga/downtime.cpp b/lib/icinga/downtime.cpp index 1364f722c..2bdec256c 100644 --- a/lib/icinga/downtime.cpp +++ b/lib/icinga/downtime.cpp @@ -75,12 +75,10 @@ void Downtime::OnAllConfigLoaded() { ObjectImpl::OnAllConfigLoaded(); - Host::Ptr host = Host::GetByName(GetHostName()); - if (GetServiceName().IsEmpty()) - m_Checkable = host; + m_Checkable = Host::GetByName(GetHostName()); else - m_Checkable = host->GetServiceByShortName(GetServiceName()); + m_Checkable = Service::GetByNamePair(GetHostName(), GetServiceName()); if (!m_Checkable) BOOST_THROW_EXCEPTION(ScriptError("Downtime '" + GetName() + "' references a host/service which doesn't exist.", GetDebugInfo()));