From 1cb40e1077894db4c92cfa01b285e28b202cce6f Mon Sep 17 00:00:00 2001 From: Gerhard Sittig Date: Sun, 24 Nov 2019 09:52:42 +0100 Subject: decoder: internal 'always false' term, handle invalid skip and channel Introduce an "always false" type for .wait() terms. Map invalid counts of skip conditions (zero or negative numbers) as well as invalid channel references for level/edge conditions to this type which never matches. Keep this "always false" term type an internal detail of the common support code. This is most robust and least intrusive at the same time, it keeps the existing API, and simplifies the implementation of Python decoders for rare edge cases (optional input signals or optional features, handling of initial samples at the very start of a capture). This commit passes sample counts internally in a signed data type. This is essential for proper operation, and the loss of one bit out of 64 shall not be considered a severe limitation. This fixes bug #1444. --- instance.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'instance.c') diff --git a/instance.c b/instance.c index 36fb2d0..5264bd0 100644 --- a/instance.c +++ b/instance.c @@ -895,6 +895,8 @@ static gboolean all_terms_match(const struct srd_decoder_inst *di, for (l = cond; l; l = l->next) { term = l->data; + if (term->type == SRD_TERM_ALWAYS_FALSE) + return FALSE; if (!term_matches(di, term, sample_pos)) return FALSE; } -- cgit v1.2.3-70-g09d2