From 1c3ccb3e040bf13e342ee60bc23b21b97b11923f Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Fri, 16 May 2014 22:10:08 +0200 Subject: Do not return illegal values in asn1_get_bit_der(). --- lib/decoding.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/decoding.c b/lib/decoding.c index 7e0ed05..894be79 100644 --- a/lib/decoding.c +++ b/lib/decoding.c @@ -249,7 +249,7 @@ asn1_get_octet_der (const unsigned char *der, int der_len, int *ret_len, unsigned char *str, int str_size, int *str_len) { - int len_len; + int len_len = 0; if (der_len <= 0) return ASN1_GENERIC_ERROR; @@ -371,7 +371,7 @@ asn1_get_bit_der (const unsigned char *der, int der_len, int *ret_len, unsigned char *str, int str_size, int *bit_len) { - int len_len, len_byte; + int len_len = 0, len_byte; if (der_len <= 0) return ASN1_GENERIC_ERROR; @@ -381,6 +381,9 @@ asn1_get_bit_der (const unsigned char *der, int der_len, *ret_len = len_byte + len_len + 1; *bit_len = len_byte * 8 - der[len_len]; + + if (*bit_len <= 0) + return ASN1_DER_ERROR; if (str_size >= len_byte) memcpy (str, der + len_len + 1, len_byte); -- cgit v1.2.3