Commit 7ca77dd
src: avoid X509_free in loops in crypto_x509.cc
Use X509Pointer objects for automatic memory management instead.
PR-URL: #44855
Reviewed-By: Darshan Sen <raisinten@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent fd99b17 commit 7ca77dd
1 file changed
Lines changed: 7 additions & 9 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -699,15 +699,14 @@ void SecureContext::AddCACert(const FunctionCallbackInfo<Value>& args) { | |||
| 699 | 699 | return; | |
| 700 | 700 | ||
| 701 | 701 | X509_STORE* cert_store = SSL_CTX_get_cert_store(sc->ctx_.get()); | |
| 702 | - while (X509* x509 = PEM_read_bio_X509_AUX( | ||
| 703 | - bio.get(), nullptr, NoPasswordCallback, nullptr)) { | ||
| 702 | + while (X509Pointer x509 = X509Pointer(PEM_read_bio_X509_AUX( | ||
| 703 | + bio.get(), nullptr, NoPasswordCallback, nullptr))) { | ||
| 704 | 704 | if (cert_store == root_cert_store) { | |
| 705 | 705 | cert_store = NewRootCertStore(); | |
| 706 | 706 | SSL_CTX_set_cert_store(sc->ctx_.get(), cert_store); | |
| 707 | 707 | } | |
| 708 | - X509_STORE_add_cert(cert_store, x509); | ||
| 709 | - SSL_CTX_add_client_CA(sc->ctx_.get(), x509); | ||
| 710 | - X509_free(x509); | ||
| 708 | + X509_STORE_add_cert(cert_store, x509.get()); | ||
| 709 | + SSL_CTX_add_client_CA(sc->ctx_.get(), x509.get()); | ||
| 711 | 710 | } | |
| 712 | 711 | } | |
| 713 | 712 | ||
@@ -1311,10 +1310,9 @@ unsigned long AddCertsFromFile( // NOLINT(runtime/int) | |||
| 1311 | 1310 | if (!bio) | |
| 1312 | 1311 | return ERR_get_error(); | |
| 1313 | 1312 | ||
| 1314 | - while (X509* x509 = | ||
| 1315 | - PEM_read_bio_X509(bio.get(), nullptr, NoPasswordCallback, nullptr)) { | ||
| 1316 | - X509_STORE_add_cert(store, x509); | ||
| 1317 | - X509_free(x509); | ||
| 1313 | + while (X509Pointer x509 = X509Pointer(PEM_read_bio_X509( | ||
| 1314 | + bio.get(), nullptr, NoPasswordCallback, nullptr))) { | ||
| 1315 | + X509_STORE_add_cert(store, x509.get()); | ||
| 1318 | 1316 | } | |
| 1319 | 1317 | ||
| 1320 | 1318 | unsigned long err = ERR_peek_error(); // NOLINT(runtime/int) | |
0 commit comments