Key strings passed to decoder options must be newly allocated

[pulseview.git] / pv / data / decoder.cpp

diff --git a/pv/data/decoder.cpp b/pv/data/decoder.cpp
index 65fc8fff7c858312fa77a902d8df9d33ea3acddd..d8a538cbec9368ddffde92d474e2478d9027adbc 100644 (file)
--- a/pv/data/decoder.cpp
+++ b/pv/data/decoder.cpp
@@ -22,6 +22,8 @@
 
 #include <boost/thread/thread.hpp>
 
+#include <stdexcept>
+
 #include <QDebug>
 
 #include "decoder.h"
@@ -51,7 +53,9 @@ Decoder::Decoder(const srd_decoder *const dec,
        _session(NULL),
        _decoder_inst(NULL)
 {
-       init_decoder();
+       if (!init_decoder())
+               throw runtime_error("Failed to initialise decoder.");
+
        begin_decode();
 }
 
@@ -61,6 +65,9 @@ Decoder::~Decoder()
        _decode_thread.join();
 
        g_hash_table_destroy(_options);
+
+       if (_session)
+               srd_session_destroy(_session);
 }
 
 const srd_decoder* Decoder::get_decoder() const
@@ -101,7 +108,7 @@ void Decoder::clear_snapshots()
 {
 }
 
-void Decoder::init_decoder()
+bool Decoder::init_decoder()
 {
        if (!_probes.empty())
        {
@@ -124,7 +131,7 @@ void Decoder::init_decoder()
        _decoder_inst = srd_inst_new(_session, _decoder->id, _options);
        if(!_decoder_inst) {
                qDebug() << "Failed to initialise decoder";
-               return;
+               return false;
        }
 
        _decoder_inst->data_samplerate = _samplerate;
@@ -144,6 +151,8 @@ void Decoder::init_decoder()
        }
 
        srd_inst_probe_set_all(_decoder_inst, probes);
+
+       return true;
 }
 
 void Decoder::decode_proc(shared_ptr<data::Logic> data)