From e92cd4e4cddac2639c1a5e278124b5bb22ace10f Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Tue, 15 Oct 2013 23:09:35 +0100
Subject: [PATCH] Added error handling to SigSession::add_decoder

---
 pv/data/decoder.cpp | 12 +++++++++---
 pv/data/decoder.h   |  2 +-
 pv/sigsession.cpp   | 12 +++++++++++-
 pv/sigsession.h     |  2 +-
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/pv/data/decoder.cpp b/pv/data/decoder.cpp
index 65fc8ff..292430b 100644
--- 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();
 }
 
@@ -101,7 +105,7 @@ void Decoder::clear_snapshots()
 {
 }
 
-void Decoder::init_decoder()
+bool Decoder::init_decoder()
 {
 	if (!_probes.empty())
 	{
@@ -124,7 +128,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 +148,8 @@ void Decoder::init_decoder()
 	}
 
 	srd_inst_probe_set_all(_decoder_inst, probes);
+
+	return true;
 }
 
 void Decoder::decode_proc(shared_ptr<data::Logic> data)
diff --git a/pv/data/decoder.h b/pv/data/decoder.h
index 93d8fa6..264920a 100644
--- a/pv/data/decoder.h
+++ b/pv/data/decoder.h
@@ -80,7 +80,7 @@ public:
 private:
 	void begin_decode();
 
-	void init_decoder();
+	bool init_decoder();
 
 	void decode_proc(boost::shared_ptr<data::Logic> data);
 
diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index a69f068..e81d360 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -34,6 +34,8 @@
 
 #include <assert.h>
 
+#include <stdexcept>
+
 #include <sys/stat.h>
 
 #include <QDebug>
@@ -193,11 +195,12 @@ boost::shared_ptr<data::Logic> SigSession::get_data()
 	return _logic_data;
 }
 
-void SigSession::add_decoder(srd_decoder *const dec,
+bool SigSession::add_decoder(srd_decoder *const dec,
 	std::map<const srd_probe*,
 		boost::shared_ptr<view::Signal> > probes,
 	GHashTable *options)
 {
+	try
 	{
 		lock_guard<mutex> lock(_signals_mutex);
 
@@ -208,7 +211,14 @@ void SigSession::add_decoder(srd_decoder *const dec,
 				_decode_traces.size()));
 		_decode_traces.push_back(d);
 	}
+	catch(std::runtime_error e)
+	{
+		return false;
+	}
+
 	signals_changed();
+
+	return true;
 }
 
 vector< shared_ptr<view::DecodeSignal> > SigSession::get_decode_signals() const
diff --git a/pv/sigsession.h b/pv/sigsession.h
index e0eb493..499814c 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -93,7 +93,7 @@ public:
 
 	boost::shared_ptr<data::Logic> get_data();
 
-	void add_decoder(srd_decoder *const dec,
+	bool add_decoder(srd_decoder *const dec,
 		std::map<const srd_probe*,
 			boost::shared_ptr<view::Signal> > probes,
 		GHashTable *options);
-- 
2.30.2