From e68b05d8592479eef51ddf9d0abbf61148815f27 Mon Sep 17 00:00:00 2001 From: Silvano Seva Date: Sat, 30 Apr 2022 08:53:31 +0200 Subject: [PATCH] Fixed double free errors in M17 code, see #73 --- openrtx/src/core/audio_codec.c | 2 ++ openrtx/src/protocols/M17/M17Demodulator.cpp | 3 ++- openrtx/src/protocols/M17/M17Modulator.cpp | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/openrtx/src/core/audio_codec.c b/openrtx/src/core/audio_codec.c index 561c29fa..d7a1ff6b 100644 --- a/openrtx/src/core/audio_codec.c +++ b/openrtx/src/core/audio_codec.c @@ -123,6 +123,8 @@ bool codec_startDecode(const enum AudioSink destination) void codec_stop() { + if(running == false) return; + running = false; pthread_join(codecThread, NULL); } diff --git a/openrtx/src/protocols/M17/M17Demodulator.cpp b/openrtx/src/protocols/M17/M17Demodulator.cpp index 35f106d6..6cf8beba 100644 --- a/openrtx/src/protocols/M17/M17Demodulator.cpp +++ b/openrtx/src/protocols/M17/M17Demodulator.cpp @@ -44,7 +44,8 @@ M17Demodulator::M17Demodulator() M17Demodulator::~M17Demodulator() { - terminate(); + // TODO + // terminate(); } void M17Demodulator::init() diff --git a/openrtx/src/protocols/M17/M17Modulator.cpp b/openrtx/src/protocols/M17/M17Modulator.cpp index 561b7112..db7c4433 100644 --- a/openrtx/src/protocols/M17/M17Modulator.cpp +++ b/openrtx/src/protocols/M17/M17Modulator.cpp @@ -39,7 +39,8 @@ M17Modulator::M17Modulator() M17Modulator::~M17Modulator() { - terminate(); + // TODO + // terminate(); } void M17Modulator::init()