From de23c992a48b5f9f145a7c26a62f10cd5b87b218 Mon Sep 17 00:00:00 2001 From: Marcus Comstedt Date: Sun, 26 Feb 2017 13:07:03 +0100 Subject: Return SRD_ERR_ARG from srd_inst_decode if samplenums are wrong This validates the requirements that * abs_start_samplenum continues where the previous decode ended * abs_end_samplenum is not lower than abs_start_samplenum Failure to meet these requirements will make v3 decoders crash. --- instance.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'instance.c') diff --git a/instance.c b/instance.c index a1de957..0e27ca3 100644 --- a/instance.c +++ b/instance.c @@ -1010,6 +1010,12 @@ SRD_PRIV int srd_inst_decode(struct srd_decoder_inst *di, return SRD_ERR_ARG; } + if (abs_start_samplenum != di->abs_cur_samplenum || + abs_end_samplenum < abs_start_samplenum) { + srd_dbg("incorrect sample numbers"); + return SRD_ERR_ARG; + } + di->data_unitsize = unitsize; srd_dbg("Decoding: abs start sample %" PRIu64 ", abs end sample %" @@ -1042,6 +1048,7 @@ SRD_PRIV int srd_inst_decode(struct srd_decoder_inst *di, di->inst_id); return SRD_ERR_PYTHON; } + di->abs_cur_samplenum = abs_end_samplenum; Py_DecRef(py_res); } else { /* If this is the first call, start the worker thread. */ -- cgit v1.2.3-70-g09d2