Merge pull request #4408 from uklotzde/encoder-memleak

EncoderFdkAac: Prevent accidental double delete/free
mixxxdj · Oct 13, 2021 · dc88c79 · dc88c79
2 parents 2391045 + 5b9e1d1
commit dc88c79
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/encoder/encoderfdkaac.cpp b/src/encoder/encoderfdkaac.cpp
@@ -286,6 +286,7 @@ int EncoderFdkAac::initEncoder(int samplerate, QString* pUserErrorMessage) {
     aacEncOpen(&m_aacEnc, 0, m_channels);
     VERIFY_OR_DEBUG_ASSERT(!m_pAacDataBuffer) {
         delete[] m_pAacDataBuffer;
+        m_pAacDataBuffer = nullptr;
     }
     m_pAacDataBuffer = new unsigned char[kOutBufferBits * m_channels]();
 
@@ -351,11 +352,13 @@ int EncoderFdkAac::initEncoder(int samplerate, QString* pUserErrorMessage) {
     // the Live Broadcasting implementation
     VERIFY_OR_DEBUG_ASSERT(!m_pInputFifo) {
         delete m_pInputFifo;
+        m_pInputFifo = nullptr;
     }
     m_pInputFifo = new FIFO<SAMPLE>(EngineSideChain::SIDECHAIN_BUFFER_SIZE * 2);
 
     VERIFY_OR_DEBUG_ASSERT(!m_pFifoChunkBuffer) {
         delete[] m_pFifoChunkBuffer;
+        m_pFifoChunkBuffer = nullptr;
     }
     m_pFifoChunkBuffer = new SAMPLE[m_readRequired * sizeof(SAMPLE)]();
     return 0;