diff options
| author | Moyster <oysterized@gmail.com> | 2017-03-20 16:39:36 +0100 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-04-11 11:00:26 +0200 |
| commit | b40cd069a444e9b23c16852012e3966ecaa99f17 (patch) | |
| tree | b58bf0d47f781dd78e79b35d9a85a1266f2eca6d /lib/asn1_decoder.c | |
| parent | ffabe4b59ef414b92894cf5b40e4e1e59eaac011 (diff) | |
mtk: squashed security updates
Diffstat (limited to 'lib/asn1_decoder.c')
| -rw-r--r-- | lib/asn1_decoder.c | 5 |
1 files changed, 2 insertions, 3 deletions
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; } |