diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2004-05-16 14:43:15 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2004-05-16 14:43:15 +0000 |
| commit | f159562926ddc965d5a778ea0f6cbdf43d5e5269 (patch) | |
| tree | 9cbbe1e818334410a9e1ccd33a083b20451178d8 | |
| parent | cc54e551119433d50b27930a5c5d77bed4c30ebb (diff) | |
| download | gnutls-f159562926ddc965d5a778ea0f6cbdf43d5e5269.tar.gz | |
Applied patch by Max Vozeler <max@hinterhof.net>,
sent by Ivo Timmermans.
| -rw-r--r-- | lib/minitasn1/decoding.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/minitasn1/decoding.c b/lib/minitasn1/decoding.c index 34825e3f3a..976777e40f 100644 --- a/lib/minitasn1/decoding.c +++ b/lib/minitasn1/decoding.c @@ -124,12 +124,13 @@ _asn1_get_octet_der(const unsigned char *der,int *der_len,unsigned char *str,int void -_asn1_get_time_der(const unsigned char *der,int *der_len,unsigned char *str) +_asn1_get_time_der(const unsigned char *der,int *der_len,unsigned char *str,int str_size) { int len_len,str_len; if(str==NULL) return; str_len=_asn1_get_length_der(der,&len_len); + if (str_len < 0 || str_size < str_len) return; memcpy(str,der+len_len,str_len); str[str_len]=0; *der_len=str_len+len_len; @@ -686,7 +687,7 @@ asn1_der_decoding(ASN1_TYPE *element,const void *ider,int len, move=RIGHT; break; case TYPE_TIME: - _asn1_get_time_der(der+counter,&len2,temp); + _asn1_get_time_der(der+counter,&len2,temp,sizeof(temp)-1); _asn1_set_value(p,temp,strlen(temp)+1); counter+=len2; move=RIGHT; @@ -1158,7 +1159,7 @@ asn1_der_decoding_element(ASN1_TYPE *structure,const char *elementName, break; case TYPE_TIME: if(state==FOUND){ - _asn1_get_time_der(der+counter,&len2,temp); + _asn1_get_time_der(der+counter,&len2,temp,sizeof(temp)-1); _asn1_set_value(p,temp,strlen(temp)+1); if(p==nodeFound) state=EXIT; |