Browse Source

plugins/channelrx/demoddatv: Guard against null demodulator in tick()

Fix Coverity CID 649227 by returning early from tick() when
m_datvDemod is null. This prevents subsequent calls such as
audioActive() from dereferencing a null pointer.

Signed-off-by: Robin Getz <rgetz503@gmail.com>
chirpmodem-v8.1.0
Robin Getz 4 weeks ago
parent
commit
321518f456
No known key found for this signature in database
GPG Key ID: 51C7231FFED0E060
  1. 61
      plugins/channelrx/demoddatv/datvdemodgui.cpp

61
plugins/channelrx/demoddatv/datvdemodgui.cpp

@ -547,39 +547,48 @@ void DATVDemodGUI::ldpcToolSelect(const QPoint& p) @@ -547,39 +547,48 @@ void DATVDemodGUI::ldpcToolSelect(const QPoint& p)
void DATVDemodGUI::tick()
{
if (m_datvDemod)
if((m_intLastDecodedData - m_intPreviousDecodedData)>=0)
{
m_objMagSqAverage(m_datvDemod->getMagSq());
double magSqDB = CalcDb::dbPower(m_objMagSqAverage / (SDR_RX_SCALED*SDR_RX_SCALED));
ui->channePowerText->setText(tr("%1 dB").arg(magSqDB, 0, 'f', 1));
m_intLastSpeed = 8 * (m_intLastDecodedData - m_intPreviousDecodedData);
ui->lblRate->setText(QString("Speed: %1b/s").arg(formatBytes(m_intLastSpeed)));
}
if ((m_modcodModulationIndex != m_datvDemod->getModcodModulation()) || (m_modcodCodeRateIndex != m_datvDemod->getModcodCodeRate()))
{
m_modcodModulationIndex = m_datvDemod->getModcodModulation();
m_modcodCodeRateIndex = m_datvDemod->getModcodCodeRate();
DATVDemodSettings::DATVModulation modulation = DATVDemodSettings::getModulationFromLeanDVBCode(m_modcodModulationIndex);
DATVDemodSettings::DATVCodeRate rate = DATVDemodSettings::getCodeRateFromLeanDVBCode(m_modcodCodeRateIndex);
QString modcodModulationStr = DATVDemodSettings::getStrFromModulation(modulation);
QString modcodCodeRateStr = DATVDemodSettings::getStrFromCodeRate(rate);
ui->statusText->setText(tr("MCOD %1 %2").arg(modcodModulationStr).arg(modcodCodeRateStr));
}
if (!m_datvDemod)
{
ui->audioMute->setStyleSheet("QToolButton { background:rgb(79,79,79); }");
ui->videoMute->setStyleSheet("QToolButton { background:rgb(79,79,79); }");
ui->playerIndicator->setStyleSheet("QLabel { background-color: gray; border-radius: 8px; }");
ui->udpIndicator->setStyleSheet("QLabel { background-color: gray; border-radius: 8px; }");
ui->channePowerText->setText("---");
ui->statusText->setText("---");
ui->statusText->setStyleSheet("QLabel { background:rgb(79,79,79); }");
return;
}
if (m_cstlnSetByModcod != m_datvDemod->isCstlnSetByModcod())
{
m_cstlnSetByModcod = m_datvDemod->isCstlnSetByModcod();
m_objMagSqAverage(m_datvDemod->getMagSq());
double magSqDB = CalcDb::dbPower(m_objMagSqAverage / (SDR_RX_SCALED*SDR_RX_SCALED));
ui->channePowerText->setText(tr("%1 dB").arg(magSqDB, 0, 'f', 1));
if (m_cstlnSetByModcod) {
ui->statusText->setStyleSheet("QLabel { background-color : green; }");
} else {
ui->statusText->setStyleSheet("QLabel { background:rgb(79,79,79); }");
}
}
if ((m_modcodModulationIndex != m_datvDemod->getModcodModulation()) || (m_modcodCodeRateIndex != m_datvDemod->getModcodCodeRate()))
{
m_modcodModulationIndex = m_datvDemod->getModcodModulation();
m_modcodCodeRateIndex = m_datvDemod->getModcodCodeRate();
DATVDemodSettings::DATVModulation modulation = DATVDemodSettings::getModulationFromLeanDVBCode(m_modcodModulationIndex);
DATVDemodSettings::DATVCodeRate rate = DATVDemodSettings::getCodeRateFromLeanDVBCode(m_modcodCodeRateIndex);
QString modcodModulationStr = DATVDemodSettings::getStrFromModulation(modulation);
QString modcodCodeRateStr = DATVDemodSettings::getStrFromCodeRate(rate);
ui->statusText->setText(tr("MCOD %1 %2").arg(modcodModulationStr).arg(modcodCodeRateStr));
}
if((m_intLastDecodedData-m_intPreviousDecodedData)>=0)
if (m_cstlnSetByModcod != m_datvDemod->isCstlnSetByModcod())
{
m_intLastSpeed = 8*(m_intLastDecodedData-m_intPreviousDecodedData);
ui->lblRate->setText(QString("Speed: %1b/s").arg(formatBytes(m_intLastSpeed)));
m_cstlnSetByModcod = m_datvDemod->isCstlnSetByModcod();
if (m_cstlnSetByModcod) {
ui->statusText->setStyleSheet("QLabel { background-color : green; }");
} else {
ui->statusText->setStyleSheet("QLabel { background:rgb(79,79,79); }");
}
}
if (m_datvDemod->audioActive())

Loading…
Cancel
Save