summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Roberts <vieuxtech@gmail.com>2016-12-22 08:50:33 -0800
committerSam Roberts <vieuxtech@gmail.com>2016-12-29 13:32:43 -0800
commitd9ac34cb792d65df3548cb31e40067306d914498 (patch)
treea3e422a3f85f5f5e0b1a40cbecaf9fb4d547058a
parent3d290d2b68a51576a49158e7e6461bb4a9c1ee6b (diff)
downloadandroid-node-v8-d9ac34cb792d65df3548cb31e40067306d914498.tar.gz
android-node-v8-d9ac34cb792d65df3548cb31e40067306d914498.tar.bz2
android-node-v8-d9ac34cb792d65df3548cb31e40067306d914498.zip
crypto: use CHECK_NE instead of ABORT or abort
Use of abort() was added in 34febfbf4, and changed to ABORT() in 21826ef21ad, but conditional+ABORT() is better expressesed using a CHECK_xxx() macro. See: https://github.com/nodejs/node/pull/9409#discussion_r93575328 PR-URL: https://github.com/nodejs/node/pull/10413 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com>
-rw-r--r--src/node_crypto.cc7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index 7b3bc40609..8e1319269e 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -701,11 +701,8 @@ static X509_STORE* NewRootCertStore() {
X509 *x509 = PEM_read_bio_X509(bp, nullptr, CryptoPemCallback, nullptr);
BIO_free(bp);
- if (x509 == nullptr) {
- // Parse errors from the built-in roots are fatal.
- ABORT();
- return nullptr;
- }
+ // Parse errors from the built-in roots are fatal.
+ CHECK_NE(x509, nullptr);
root_certs_vector->push_back(x509);
}