From a7607ad0371eb2ab88bd44090a401c94a2311cc1 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Mon, 3 Dec 2018 14:12:57 +0100 Subject: [PATCH] Fix for crashing of non-configured streams --- lib/stream.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/stream.cpp b/lib/stream.cpp index 879e1f51..042834cf 100644 --- a/lib/stream.cpp +++ b/lib/stream.cpp @@ -355,16 +355,17 @@ uint8_t Util::getStreamStatus(const std::string & streamname){ Util::DTSCShmReader::DTSCShmReader(const std::string &pageName){ rPage.init(pageName, 0); - if (rPage){ - rAcc = Util::RelAccX(rPage.mapped); - } + if (rPage){rAcc = Util::RelAccX(rPage.mapped);} } DTSC::Scan Util::DTSCShmReader::getMember(const std::string &indice){ - return DTSC::Scan(rAcc.getPointer("dtsc_data"), rAcc.getSize("dtsc_data")).getMember(indice.c_str()); + if (!rPage){return DTSC::Scan();} + return DTSC::Scan(rAcc.getPointer("dtsc_data"), rAcc.getSize("dtsc_data")) + .getMember(indice.c_str()); } DTSC::Scan Util::DTSCShmReader::getScan(){ + if (!rPage){return DTSC::Scan();} return DTSC::Scan(rAcc.getPointer("dtsc_data"), rAcc.getSize("dtsc_data")); }