projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainWindow, View::View: Fix two memory errors reported by valgrind
[pulseview.git]
/
pv
/
data
/
decoderstack.cpp
diff --git
a/pv/data/decoderstack.cpp
b/pv/data/decoderstack.cpp
index d4daa5902a1d2a47d9f727da8dda74c5c6f5ef9c..648b4cf57917a0cf3ea0a608942b1313c88719a6 100644
(file)
--- a/
pv/data/decoderstack.cpp
+++ b/
pv/data/decoderstack.cpp
@@
-191,9
+191,6
@@
void DecoderStack::clear()
void DecoderStack::begin_decode()
{
void DecoderStack::begin_decode()
{
- shared_ptr<pv::view::LogicSignal> logic_signal;
- shared_ptr<pv::data::Logic> data;
-
if (decode_thread_.joinable()) {
interrupt_ = true;
input_cond_.notify_one();
if (decode_thread_.joinable()) {
interrupt_ = true;
input_cond_.notify_one();
@@
-241,11
+238,14
@@
void DecoderStack::begin_decode()
// We get the logic data of the first channel in the list.
// This works because we are currently assuming all
// We get the logic data of the first channel in the list.
// This works because we are currently assuming all
- // LogicSignals have the same data/segment
+ // logic signals have the same data/segment
+ pv::data::SignalBase *signalbase;
+ pv::data::Logic *data = nullptr;
+
for (const shared_ptr<decode::Decoder> &dec : stack_)
if (dec && !dec->channels().empty() &&
for (const shared_ptr<decode::Decoder> &dec : stack_)
if (dec && !dec->channels().empty() &&
- ((
logic_signal = (*dec->channels().begin()).second
)) &&
- ((data =
logic_signal->logic_data
())))
+ ((
signalbase = (*dec->channels().begin()).second.get()
)) &&
+ ((data =
signalbase->logic_data().get
())))
break;
if (!data)
break;
if (!data)