From d67b1e9c9323e04868c8ff25a0c927951ff7be63 Mon Sep 17 00:00:00 2001 From: satbaby Date: Thu, 13 Dec 2012 14:03:04 +0100 Subject: [PATCH] src/zapit/src/zapit.cpp: fix segfault if channel==NULL (reloadchannels) --- src/zapit/src/zapit.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index bcb08d681..a50342ec4 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -416,6 +416,9 @@ audio_map_set_t * CZapit::GetSavedPids(const t_channel_id channel_id) bool CZapit::TuneChannel(CFrontend * frontend, CZapitChannel * channel, bool &transponder_change) { + if(channel == NULL || frontend == NULL) + return false; + transponder_change = frontend->setInput(channel, current_is_nvod); if(transponder_change && !current_is_nvod) { int waitForMotor = frontend->driveToSatellitePosition(channel->getSatellitePosition()); @@ -443,6 +446,9 @@ bool CZapit::TuneChannel(CFrontend * frontend, CZapitChannel * channel, bool &tr bool CZapit::ParsePatPmt(CZapitChannel * channel) { + if(channel == NULL) + return false; + CPat pat(channel->getRecordDemux()); CPmt pmt(channel->getRecordDemux()); DBG("looking up pids for channel_id " PRINTF_CHANNEL_ID_TYPE "\n", channel->getChannelID());