From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Mon, 17 Mar 2014 07:41:53 +0000 (+0100)
Subject: Fix null pointer dereference in Timer::AdjustTimers.
X-Git-Tag: v0.0.9~88
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ecce27f9dab746540ebca9ab470e6d10bcd0dfcc;p=icinga2

Fix null pointer dereference in Timer::AdjustTimers.

Fixes #5783
---

diff --git a/lib/base/timer.cpp b/lib/base/timer.cpp
index 63fbd669d..347b9186f 100644
--- a/lib/base/timer.cpp
+++ b/lib/base/timer.cpp
@@ -244,6 +244,9 @@ void Timer::AdjustTimers(double adjustment)
 	for (it = idx.begin(); it != idx.end(); it++) {
 		Timer::Ptr timer = it->lock();
 
+		if (!timer)
+			continue;
+
 		if (abs(now - (timer->m_Next + adjustment)) <
 		    abs(now - timer->m_Next)) {
 			timer->m_Next += adjustment;