From 9842e477afaccd13ca55f238389407fd9db0dc12 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Wed, 28 Apr 2021 15:37:18 +0100 Subject: [PATCH] Fix small memory leak in Packet demod --- plugins/channelrx/demodadsb/adsbdemodsink.cpp | 4 ++-- plugins/channelrx/demodpacket/packetdemodsink.cpp | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/plugins/channelrx/demodadsb/adsbdemodsink.cpp b/plugins/channelrx/demodadsb/adsbdemodsink.cpp index 0486d1f96..2157410b7 100644 --- a/plugins/channelrx/demodadsb/adsbdemodsink.cpp +++ b/plugins/channelrx/demodadsb/adsbdemodsink.cpp @@ -55,7 +55,7 @@ ADSBDemodSink::ADSBDemodSink() : ADSBDemodSink::~ADSBDemodSink() { for (int i = 0; i < m_buffers; i++) - delete m_sampleBuffer[i]; + delete[] m_sampleBuffer[i]; } void ADSBDemodSink::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end) @@ -207,7 +207,7 @@ void ADSBDemodSink::init(int samplesPerBit) for (int i = 0; i < m_buffers; i++) { if (m_sampleBuffer[i]) - delete m_sampleBuffer[i]; + delete[] m_sampleBuffer[i]; } m_samplesPerFrame = samplesPerBit*(ADS_B_PREAMBLE_BITS+ADS_B_ES_BITS); diff --git a/plugins/channelrx/demodpacket/packetdemodsink.cpp b/plugins/channelrx/demodpacket/packetdemodsink.cpp index 3cb9f0b6a..a6d0f86bf 100644 --- a/plugins/channelrx/demodpacket/packetdemodsink.cpp +++ b/plugins/channelrx/demodpacket/packetdemodsink.cpp @@ -55,6 +55,9 @@ PacketDemodSink::PacketDemodSink(PacketDemod *packetDemod) : PacketDemodSink::~PacketDemodSink() { + delete[] m_f1; + delete[] m_f0; + delete[] m_corrBuf; } void PacketDemodSink::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end) @@ -301,9 +304,9 @@ void PacketDemodSink::applySettings(const PacketDemodSettings& settings, bool fo if (force) { - delete m_f1; - delete m_f0; - delete m_corrBuf; + delete[] m_f1; + delete[] m_f0; + delete[] m_corrBuf; m_correlationLength = PACKETDEMOD_CHANNEL_SAMPLE_RATE/settings.m_baud; m_f1 = new Complex[m_correlationLength](); m_f0 = new Complex[m_correlationLength]();