From 89836def2f01d7ce04d6a61c24e823226f3d8832 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 10 Jun 2016 10:22:02 +0100 Subject: [PATCH] Added check for null whitelist --- DMRSlot.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/DMRSlot.cpp b/DMRSlot.cpp index 76e2e06..0a5f4b1 100644 --- a/DMRSlot.cpp +++ b/DMRSlot.cpp @@ -1487,6 +1487,8 @@ bool CDMRSlot::DstIdBlacklist(unsigned int did, unsigned int slot) bool CDMRSlot::DstIdWhitelist(unsigned int did, unsigned int slot, bool gt4k) { if (slot == 1) { + if(m_dstWhiteListSlot1.size == 0) + return; if(gt4k) { if (std::find(m_dstWhiteListSlot1.begin(), m_dstWhiteListSlot1.end(), did) != m_dstWhiteListSlot1.end() || did >= 4000) return true; @@ -1495,6 +1497,8 @@ bool CDMRSlot::DstIdWhitelist(unsigned int did, unsigned int slot, bool gt4k) return true; } } else { + if(m_dstWhiteListSlot2.size == 0) + return; if(gt4k) { if (std::find(m_dstWhiteListSlot2.begin(), m_dstWhiteListSlot2.end(), did) != m_dstWhiteListSlot2.end() || did >= 4000) return true;