diff options
| author | Matt Caswell <matt@openssl.org> | 2017-06-21 16:56:36 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-08-21 09:44:44 +0200 |
| commit | 24664a3bf56c9372d4b358c1c90cacaba8fb4c14 (patch) | |
| tree | 67d1c86a24d0f99cdfcce0f8becd408d7b850f69 /crypto/x509/x_x509.c | |
| parent | Remove OPENSSL_assert() from crypto/threads_none.c (diff) | |
| download | openssl-24664a3bf56c9372d4b358c1c90cacaba8fb4c14.tar.xz openssl-24664a3bf56c9372d4b358c1c90cacaba8fb4c14.zip | |
Remove OPENSSL_assert() from crypto/x509
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3740)
Diffstat (limited to 'crypto/x509/x_x509.c')
| -rw-r--r-- | crypto/x509/x_x509.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/x509/x_x509.c b/crypto/x509/x_x509.c index 6783fd8728..b45944851d 100644 --- a/crypto/x509/x_x509.c +++ b/crypto/x509/x_x509.c @@ -145,7 +145,8 @@ static int i2d_x509_aux_internal(X509 *a, unsigned char **pp) int length, tmplen; unsigned char *start = pp != NULL ? *pp : NULL; - OPENSSL_assert(pp == NULL || *pp != NULL); + if (!ossl_assert(pp == NULL || *pp != NULL)) + return -1; /* * This might perturb *pp on error, but fixing that belongs in i2d_X509() |