summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/decoding.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/decoding.c b/lib/decoding.c
index 4fa045c..6fd60d0 100644
--- a/lib/decoding.c
+++ b/lib/decoding.c
@@ -767,10 +767,17 @@ _asn1_extract_der_octet (asn1_node node, const unsigned char *der,
DECR_LEN(der_len, len3);
if (len2 == -1)
- counter_end = der_len - 2;
+ {
+ if (der_len < 2)
+ return ASN1_DER_ERROR;
+ counter_end = der_len - 2;
+ }
else
counter_end = der_len;
+ if (counter_end < counter)
+ return ASN1_DER_ERROR;
+
while (counter < counter_end)
{
DECR_LEN(der_len, 1);