diff options
| author | Bodo Möller <bodo@openssl.org> | 2008-07-16 18:10:27 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2008-07-16 18:10:27 +0000 |
| commit | efa73a77e41777415f0d5830fe0fac66a18d54fc (patch) | |
| tree | 5249b571012f17eabc0d7d3ab246bddd2ef5c6d6 /crypto | |
| parent | 89778b7f3f1bd9c7b4e2cdf535f389d37b5ec558 (diff) | |
Make sure not to read beyond end of buffer
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/asn1/t_x509.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/crypto/asn1/t_x509.c b/crypto/asn1/t_x509.c index 1bb8e82d63..7d22e1c0ce 100644 --- a/crypto/asn1/t_x509.c +++ b/crypto/asn1/t_x509.c @@ -370,12 +370,13 @@ int ASN1_GENERALIZEDTIME_print(BIO *bp, const ASN1_GENERALIZEDTIME *tm) d= (v[6]-'0')*10+(v[7]-'0'); h= (v[8]-'0')*10+(v[9]-'0'); m= (v[10]-'0')*10+(v[11]-'0'); - if ( (v[12] >= '0') && (v[12] <= '9') && - (v[13] >= '0') && (v[13] <= '9')) + if (i >= 14 && + (v[12] >= '0') && (v[12] <= '9') && + (v[13] >= '0') && (v[13] <= '9')) { s= (v[12]-'0')*10+(v[13]-'0'); /* Check for fractions of seconds. */ - if (v[14] == '.') + if (i >= 15 && v[14] == '.') { int l = tm->length; f = &v[14]; /* The decimal point. */ @@ -416,8 +417,9 @@ int ASN1_UTCTIME_print(BIO *bp, const ASN1_UTCTIME *tm) d= (v[4]-'0')*10+(v[5]-'0'); h= (v[6]-'0')*10+(v[7]-'0'); m= (v[8]-'0')*10+(v[9]-'0'); - if ( (v[10] >= '0') && (v[10] <= '9') && - (v[11] >= '0') && (v[11] <= '9')) + if (i >=12 && + (v[10] >= '0') && (v[10] <= '9') && + (v[11] >= '0') && (v[11] <= '9')) s= (v[10]-'0')*10+(v[11]-'0'); if (BIO_printf(bp,"%s %2d %02d:%02d:%02d %d%s", @@ -489,4 +491,3 @@ err: OPENSSL_free(b); return(ret); } - |