Skip to content

Commit 125ab7d

Browse files
tniessenRafaelGSS
authored andcommitted
src: improve error handling in CloneSSLCerts
If sk_X509_new() returns NULL or if sk_X509_push() fails, return instead of silently ignoring the error. PR-URL: #44410 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Filip Skokan <panva.ip@gmail.com>
1 parent aa34f73 commit 125ab7d

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/crypto/crypto_common.cc

+3-2
Original file line numberDiff line numberDiff line change
@@ -323,8 +323,9 @@ constexpr auto GetCipherVersion = GetCipherValue<SSL_CIPHER_get_version>;
323323
StackOfX509 CloneSSLCerts(X509Pointer&& cert,
324324
const STACK_OF(X509)* const ssl_certs) {
325325
StackOfX509 peer_certs(sk_X509_new(nullptr));
326-
if (cert)
327-
sk_X509_push(peer_certs.get(), cert.release());
326+
if (!peer_certs) return StackOfX509();
327+
if (cert && !sk_X509_push(peer_certs.get(), cert.release()))
328+
return StackOfX509();
328329
for (int i = 0; i < sk_X509_num(ssl_certs); i++) {
329330
X509Pointer cert(X509_dup(sk_X509_value(ssl_certs, i)));
330331
if (!cert || !sk_X509_push(peer_certs.get(), cert.get()))

0 commit comments

Comments
 (0)