Browse Source

modemdvb: Validate constellation in InnerDecoder::configure

Reject invalid constellation values before configuring decoder
state or calculating bit-interleaver sizes and indices.

This prevents invalid bits-per-cell values from causing
invalid vector sizes and out-of-bounds accesses.

Coverity CIDs 657500 and 657487.

Signed-off-by: Robin Getz <rgetz503@gmail.com>
chirpmodem-v8.1.0
Robin Getz 4 weeks ago
parent
commit
1f93fa6fc8
No known key found for this signature in database
GPG Key ID: 51C7231FFED0E060
  1. 13
      modemdvb/dvbtinner.cpp

13
modemdvb/dvbtinner.cpp

@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
#include <algorithm>
#include <cmath>
#include <QDebug>
#include "dvbtinner.h"
@ -88,6 +89,18 @@ float InnerDecoder::normalisation(Constellation constellation, Hierarchy hierarc @@ -88,6 +89,18 @@ float InnerDecoder::normalisation(Constellation constellation, Hierarchy hierarc
void InnerDecoder::configure(Mode mode, Constellation constellation, CodeRate codeRate, Hierarchy hierarchy, bool lowPriority)
{
switch (constellation)
{
case Constellation::QPSK:
case Constellation::QAM16:
case Constellation::QAM64:
break;
default:
qWarning() << "InnerDecoder::configure: Invalid constellation"
<< static_cast<int>(constellation);
return;
}
const Tables& tables = Tables::get(mode);
m_mode = mode;

Loading…
Cancel
Save