Merge PR #6604: FIX(client): Fix memory leaks due to BIO_NOCLOSE flag

mumble-voip · Jan 13, 2025 · 66e202f · 66e202f
2 parents ba3a32d + 1fcb27f
commit 66e202f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/mumble/Cert.cpp b/src/mumble/Cert.cpp
@@ -436,8 +436,7 @@ Settings::KeyPair CertWizard::importCert(QByteArray data, const QString &pw) {
 	Settings::KeyPair kp;
 	int ret = 0;
 
-	mem = BIO_new_mem_buf(data.data(), static_cast< int >(data.size()));
-	Q_UNUSED(BIO_set_close(mem, BIO_NOCLOSE));
+	mem  = BIO_new_mem_buf(data.data(), static_cast< int >(data.size()));
 	pkcs = d2i_PKCS12_bio(mem, nullptr);
 	if (pkcs) {
 		ret = PKCS12_parse(pkcs, nullptr, &pkey, &x509, &certs);

diff --git a/src/murmur/Cert.cpp b/src/murmur/Cert.cpp
@@ -32,13 +32,11 @@ bool Server::isKeyForCert(const QSslKey &key, const QSslCertificate &cert) {
 	EVP_PKEY *pkey = nullptr;
 	BIO *mem       = nullptr;
 
-	mem = BIO_new_mem_buf(qbaKey.data(), static_cast< int >(qbaKey.size()));
-	Q_UNUSED(BIO_set_close(mem, BIO_NOCLOSE));
+	mem  = BIO_new_mem_buf(qbaKey.data(), static_cast< int >(qbaKey.size()));
 	pkey = d2i_PrivateKey_bio(mem, nullptr);
 	BIO_free(mem);
 
-	mem = BIO_new_mem_buf(qbaCert.data(), static_cast< int >(qbaCert.size()));
-	Q_UNUSED(BIO_set_close(mem, BIO_NOCLOSE));
+	mem  = BIO_new_mem_buf(qbaCert.data(), static_cast< int >(qbaCert.size()));
 	x509 = d2i_X509_bio(mem, nullptr);
 	BIO_free(mem);
 	mem = nullptr;