test/acl
1
0
Fork 0
mirror of https://gitee.com/acl-dev/acl.git synced 2024-11-30 02:47:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed bugs for double free in ~openssl_conf().

Browse Source
This commit is contained in:
zhengshuxin 2023-02-14 09:57:42 +08:00
parent 47e3a01aa9
commit 525da0701c
2 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib_acl_cpp/include/acl_cpp/stream/openssl_conf.hpp
View File

@ -1,6 +1,7 @@
#pragma once
#include "../acl_cpp_define.hpp"
#include <vector>
#include <set>
#include "../stdlib/thread_mutex.hpp"
#include "../stdlib/string.hpp"
#include "../stdlib/token_tree.hpp"
@ -124,6 +125,7 @@ private:
SSL_CTX* ssl_ctx_; // The default SSL_CTX.
token_tree* ssl_ctx_table_; // Holding the map of host/SSL_CTX.
int ssl_ctx_count_;
std::set<SSL_CTX*> ssl_ctxes_; // Holding all ctx just for freeing.
int timeout_;
string crt_file_;
unsigned init_status_;

30
lib_acl_cpp/src/stream/openssl_conf.cpp
View File

@ -488,19 +488,13 @@ openssl_conf::openssl_conf(bool server_side /* false */, int timeout /* 30 */)
openssl_conf::~openssl_conf(void)
{
#ifdef HAS_OPENSSL
if (ssl_ctx_table_) {
const token_node* node = ssl_ctx_table_->first_node();
while (node) {
SSL_CTX* ctx = (SSL_CTX*) node->get_ctx();
if (ctx) {
__ssl_ctx_free(ctx);
}
node = ssl_ctx_table_->next_node();
}
delete ssl_ctx_table_;
} else if (ssl_ctx_) {
__ssl_ctx_free(ssl_ctx_);
for (std::set<SSL_CTX*>::iterator it = ssl_ctxes_.begin();
it != ssl_ctxes_.end(); ++it) {
__ssl_ctx_free(*it);
}
delete ssl_ctx_table_;
#endif
}
@ -574,6 +568,7 @@ SSL_CTX* openssl_conf::create_ssl_ctx(void)
(void (*)(void)) sni_callback);
__ssl_ctx_ctrl(ctx, SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG, 0, this);
ssl_ctxes_.insert(ctx);
return ctx;
#else
return NULL;
@ -609,14 +604,9 @@ SSL_CTX* openssl_conf::get_ssl_ctx(void) const
void openssl_conf::get_ssl_ctxes(std::vector<SSL_CTX*>& out)
{
#ifdef HAS_OPENSSL
if (ssl_ctx_table_) {
const token_node* node = ssl_ctx_table_->first_node();
while (node) {
SSL_CTX* ctx = (SSL_CTX*) node->get_ctx();
if (ctx) {
out.push_back(ctx);
}
}
for (std::set<SSL_CTX*>::iterator it = ssl_ctxes_.begin();
it != ssl_ctxes_.end(); ++it) {
out.push_back(*it);
}
#else
(void) out;