From b40cd069a444e9b23c16852012e3966ecaa99f17 Mon Sep 17 00:00:00 2001 From: Moyster Date: Mon, 20 Mar 2017 16:39:36 +0100 Subject: mtk: squashed security updates --- lib/asn1_decoder.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lib/asn1_decoder.c') diff --git a/lib/asn1_decoder.c b/lib/asn1_decoder.c index 2937ba5e5..a6b531906 100644 --- a/lib/asn1_decoder.c +++ b/lib/asn1_decoder.c @@ -210,9 +210,8 @@ next_op: unsigned char tmp; /* Skip conditional matches if possible */ - if ((op & ASN1_OP_MATCH__COND && - flags & FLAG_MATCHED) || - dp == datalen) { + if ((op & ASN1_OP_MATCH__COND && flags & FLAG_MATCHED) || + (op & ASN1_OP_MATCH__SKIP && dp == datalen)) { pc += asn1_op_lengths[op]; goto next_op; } -- cgit v1.2.3