diff options
| author | FdaSilvaYY <fdasilvayy@gmail.com> | 2016-06-27 21:57:58 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-07-05 17:45:50 +0100 |
| commit | 68efafc513788863339c199d22048ef275832094 (patch) | |
| tree | 2a409883db3b7f56d4571d77735c964bed640669 /crypto/x509/x509_lu.c | |
| parent | c2d551c01930df54bce6517cfecd214db6e98e80 (diff) | |
| download | openssl-68efafc513788863339c199d22048ef275832094.zip openssl-68efafc513788863339c199d22048ef275832094.tar.gz openssl-68efafc513788863339c199d22048ef275832094.tar.bz2 | |
Add checks on sk_TYPE_push() returned value
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'crypto/x509/x509_lu.c')
| -rw-r--r-- | crypto/x509/x509_lu.c | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c index 0b5b5b9..843f351 100644 --- a/crypto/x509/x509_lu.c +++ b/crypto/x509/x509_lu.c @@ -301,7 +301,7 @@ int X509_STORE_CTX_get_by_subject(X509_STORE_CTX *vs, X509_LOOKUP_TYPE type, int X509_STORE_add_cert(X509_STORE *ctx, X509 *x) { X509_OBJECT *obj; - int ret = 1; + int ret = 1, added = 1; if (x == NULL) return 0; @@ -310,28 +310,33 @@ int X509_STORE_add_cert(X509_STORE *ctx, X509 *x) return 0; obj->type = X509_LU_X509; obj->data.x509 = x; + X509_OBJECT_up_ref_count(obj); CRYPTO_THREAD_write_lock(ctx->lock); - X509_OBJECT_up_ref_count(obj); - if (X509_OBJECT_retrieve_match(ctx->objs, obj)) { - X509_OBJECT_free(obj); X509err(X509_F_X509_STORE_ADD_CERT, X509_R_CERT_ALREADY_IN_HASH_TABLE); ret = 0; - } else - sk_X509_OBJECT_push(ctx->objs, obj); + } else { + added = sk_X509_OBJECT_push(ctx->objs, obj); + ret = added != 0; + } CRYPTO_THREAD_unlock(ctx->lock); + if (!ret) /* obj not pushed */ + X509_OBJECT_free(obj); + if (!added) /* on push failure */ + X509err(X509_F_X509_STORE_ADD_CERT, ERR_R_MALLOC_FAILURE); + return ret; } int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x) { X509_OBJECT *obj; - int ret = 1; + int ret = 1, added = 1; if (x == NULL) return 0; @@ -340,20 +345,25 @@ int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x) return 0; obj->type = X509_LU_CRL; obj->data.crl = x; + X509_OBJECT_up_ref_count(obj); CRYPTO_THREAD_write_lock(ctx->lock); - X509_OBJECT_up_ref_count(obj); - if (X509_OBJECT_retrieve_match(ctx->objs, obj)) { - X509_OBJECT_free(obj); X509err(X509_F_X509_STORE_ADD_CRL, X509_R_CERT_ALREADY_IN_HASH_TABLE); ret = 0; - } else - sk_X509_OBJECT_push(ctx->objs, obj); + } else { + added = sk_X509_OBJECT_push(ctx->objs, obj); + ret = added != 0; + } CRYPTO_THREAD_unlock(ctx->lock); + if (!ret) /* obj not pushed */ + X509_OBJECT_free(obj); + if (!added) /* on push failure */ + X509err(X509_F_X509_STORE_ADD_CRL, ERR_R_MALLOC_FAILURE); + return ret; } |