Fixed zero divide in possible race conditions and also return to init…

…ial state when changing decode mode
f4exb · Aug 22, 2019 · b8ecee6 · b8ecee6
1 parent a0f4694
commit b8ecee6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/dsd_decoder.cpp b/dsd_decoder.cpp
@@ -236,6 +236,11 @@ void DSDDecoder::setDecodeMode(DSDDecodeMode mode, bool on)
     default:
         break;
     }
+
+    resetFrameSync();
+    noCarrier();
+    m_squelchTimeoutCount = 0;
+    m_nxdnInterSyncCount = -1; // reset to quiet state
 }
 
 void DSDDecoder::setAudioGain(float gain)

diff --git a/dsd_symbol.cpp b/dsd_symbol.cpp
@@ -262,6 +262,12 @@ bool DSDSymbol::pushSample(short sample)
 
     if (m_sampleIndex == m_samplesPerSymbol - 1) // conclusion
     {
+        if (m_count == 0) // out of sync for example because of race condition
+        {
+            m_sampleIndex = 0; // return to the beginning of a symbol
+            return false;      // and wait for next sample
+        }
+
         m_symbol = m_sum / m_count;
         m_dsdDecoder->m_state.symbolcnt++;