diff options
| author | Xin LI <delphij@FreeBSD.org> | 2017-11-29 05:59:50 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2017-11-29 05:59:50 +0000 |
| commit | 79eb89bc8b3f04d58dff25f21343898eb2f83cf2 (patch) | |
| tree | 31fc0a21d03fd9aed9e1c6cf14344ffb7d501d95 /crypto | |
| parent | a7779e69107503a2fb2ab5ef6f40e57540dcc525 (diff) | |
Notes
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/openssl/crypto/x509v3/v3_addr.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/crypto/openssl/crypto/x509v3/v3_addr.c b/crypto/openssl/crypto/x509v3/v3_addr.c index 1290dec9bb8c..af080a04f2ba 100644 --- a/crypto/openssl/crypto/x509v3/v3_addr.c +++ b/crypto/openssl/crypto/x509v3/v3_addr.c @@ -130,10 +130,12 @@ static int length_from_afi(const unsigned afi) */ unsigned int v3_addr_get_afi(const IPAddressFamily *f) { - return ((f != NULL && - f->addressFamily != NULL && f->addressFamily->data != NULL) - ? ((f->addressFamily->data[0] << 8) | (f->addressFamily->data[1])) - : 0); + if (f == NULL + || f->addressFamily == NULL + || f->addressFamily->data == NULL + || f->addressFamily->length < 2) + return 0; + return (f->addressFamily->data[0] << 8) | f->addressFamily->data[1]; } /* |