From: Joel Holdsworth <redacted>
Date: Sun, 12 Jan 2014 20:58:20 +0000 (+0000)
Subject: decode: Do not overflow the chunk buffer
X-Git-Tag: pulseview-0.2.0~146
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=064a7f42c7a107eae88c946718fe4141b52f8e0c;p=pulseview.git

decode: Do not overflow the chunk buffer

This should resolve bug #225
---

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index 5b58761f..b8eff67f 100644
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -173,12 +173,13 @@ void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
 	const shared_ptr<pv::data::LogicSnapshot> &snapshot =
 		snapshots.front();
 	const int64_t sample_count = snapshot->get_sample_count() - 1;
+	const unsigned int chunk_sample_count =
+		DecodeChunkLength / snapshot->unit_size();
 
 	// Create the session
 	srd_session_new(&session);
 	assert(session);
 
-
 	// Create the decoders
 	BOOST_FOREACH(const shared_ptr<decode::Decoder> &dec, _stack)
 	{
@@ -209,12 +210,12 @@ void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
 	for (int64_t i = 0;
 		!boost::this_thread::interruption_requested() &&
 			i < sample_count;
-		i += DecodeChunkLength)
+		i += chunk_sample_count)
 	{
 		lock_guard<mutex> decode_lock(_global_decode_mutex);
 
 		const int64_t chunk_end = min(
-			i + DecodeChunkLength, sample_count);
+			i + chunk_sample_count, sample_count);
 		snapshot->get_samples(chunk, i, chunk_end);
 
 		if (srd_session_send(session, i, i + sample_count,