From d2e0b7d9401773ee5aa5ebca2fa3abd667bdc14d Mon Sep 17 00:00:00 2001
From: Silvano Seva <silseva@fastwebnet.it>
Date: Sun, 5 Jun 2022 12:27:25 +0200
Subject: [PATCH] Improved heap memory management in M17 modulator class

---
 openrtx/include/protocols/M17/M17Modulator.h | 11 ++++++-----
 openrtx/src/protocols/M17/M17Modulator.cpp   | 20 +++++++++++++-------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/openrtx/include/protocols/M17/M17Modulator.h b/openrtx/include/protocols/M17/M17Modulator.h
index 640b02f9..c7c82882 100644
--- a/openrtx/include/protocols/M17/M17Modulator.h
+++ b/openrtx/include/protocols/M17/M17Modulator.h
@@ -28,6 +28,7 @@
 #include <interfaces/audio_stream.h>
 #include <M17/M17Constants.h>
 #include <cstdint>
+#include <memory>
 #include <array>
 #include <dsp.h>
 
@@ -100,11 +101,11 @@ private:
     #endif
 
     std::array< int16_t, M17_FRAME_SYMBOLS > symbols;
-    stream_sample_t  *baseband_buffer;  ///< Buffer for baseband audio handling.
-    stream_sample_t  *idleBuffer;       ///< Half baseband buffer, free for processing.
-    streamId         outStream;         ///< Baseband output stream ID.
-    bool             txRunning;         ///< Transmission running.
-    bool             stopTx;            ///< Stop transmission request.
+    std::unique_ptr< int16_t[] > baseband_buffer;  ///< Buffer for baseband audio handling.
+    stream_sample_t              *idleBuffer;      ///< Half baseband buffer, free for processing.
+    streamId                     outStream;        ///< Baseband output stream ID.
+    bool                         txRunning;        ///< Transmission running.
+    bool                         stopTx;           ///< Stop transmission request.
 
     #if defined(PLATFORM_MD3x0) || defined(PLATFORM_MDUV3x0)
     filter_state_t   pwmFilterState;
diff --git a/openrtx/src/protocols/M17/M17Modulator.cpp b/openrtx/src/protocols/M17/M17Modulator.cpp
index 61c9c209..5bcb60b2 100644
--- a/openrtx/src/protocols/M17/M17Modulator.cpp
+++ b/openrtx/src/protocols/M17/M17Modulator.cpp
@@ -40,8 +40,7 @@ M17Modulator::M17Modulator()
 
 M17Modulator::~M17Modulator()
 {
-    // TODO
-    // terminate();
+    terminate();
 }
 
 void M17Modulator::init()
@@ -52,8 +51,8 @@ void M17Modulator::init()
      * placement new.
      */
 
-    baseband_buffer = new int16_t[2 * M17_FRAME_SAMPLES];
-    idleBuffer      = baseband_buffer;
+    baseband_buffer = std::make_unique< int16_t[] >(2 * M17_FRAME_SAMPLES);
+    idleBuffer      = baseband_buffer.get();
     txRunning       = false;
     #if defined(PLATFORM_MD3x0) || defined(PLATFORM_MDUV3x0)
     dsp_resetFilterState(&pwmFilterState);
@@ -62,8 +61,15 @@ void M17Modulator::init()
 
 void M17Modulator::terminate()
 {
+    // Terminate an ongoing stream, if present
+    if(txRunning)
+    {
+        outputStream_terminate(outStream);
+        txRunning = false;
+    }
+
     // Deallocate memory.
-    delete[] baseband_buffer;
+    baseband_buffer.reset();
 }
 
 void M17Modulator::send(const std::array< uint8_t, 2 >& sync,
@@ -119,7 +125,7 @@ void M17Modulator::emitBaseband()
         // First run, start transmission
         outStream = outputStream_start(SINK_RTX,
                                        PRIO_TX,
-                                       baseband_buffer,
+                                       baseband_buffer.get(),
                                        2*M17_FRAME_SAMPLES,
                                        BUF_CIRC_DOUBLE,
                                        M17_TX_SAMPLE_RATE);
@@ -140,7 +146,7 @@ void M17Modulator::emitBaseband()
         outputStream_sync(outStream, false);
         stopTx     = false;
         txRunning  = false;
-        idleBuffer = baseband_buffer;
+        idleBuffer = baseband_buffer.get();
         #if defined(PLATFORM_MD3x0) || defined(PLATFORM_MDUV3x0)
         dsp_resetFilterState(&pwmFilterState);
         #endif