pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-03 13:36:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Migrate shared memory to use content database source; add logic in DB::core to prevent double freeing [skip ci]

Browse Source
This commit is contained in:
Akkadius
2020-03-12 01:23:06 -05:00
parent 49d835165c
commit 7ee28d6361
3 changed files with 47 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/dbcore.cpp
+18 -11
View File
@@ -42,11 +42,20 @@ DBcore::DBcore()
pCompress = false;
pSSL = false;
pStatus = Closed;
connection_type = DATABASE_CONNECTION_DEFAULT;
}
DBcore::~DBcore()
{
/**
* This prevents us from doing a double free in multi-tenancy setups where we
* are re-using the default database connection pointer when we dont have an
* external configuration setup ex: (content_database)
*/
std::string mysql_connection_host = mysql.host;
if (GetOriginHost() != mysql_connection_host) {
return;
}
mysql_close(&mysql);
safe_delete_array(pHost);
safe_delete_array(pUser);
@@ -247,6 +256,10 @@ bool DBcore::Open(uint32 *errnum, char *errbuf)
}
if (mysql_real_connect(&mysql, pHost, pUser, pPassword, pDatabase, pPort, 0, flags)) {
pStatus = Connected;
std::string connected_origin_host = pHost;
SetOriginHost(connected_origin_host);
return true;
}
else {
@@ -266,18 +279,12 @@ void DBcore::SetMysql(MYSQL *mysql)
DBcore::mysql = *mysql;
}
int8 DBcore::GetConnectionType() const
const std::string &DBcore::GetOriginHost() const
{
return connection_type;
return origin_host;
}
void DBcore::SetConnectionType(int8 connection_type)
void DBcore::SetOriginHost(const std::string &origin_host)
{
DBcore::connection_type = connection_type;
DBcore::origin_host = origin_host;
}
common/dbcore.h
+4 -6
View File
@@ -13,9 +13,6 @@
#include <mysql.h>
#include <string.h>
const int8 DATABASE_CONNECTION_DEFAULT = 0;
const int8 DATABASE_CONNECTION_CONTENT = 1;
class DBcore {
public:
enum eStatus {
@@ -35,8 +32,8 @@ public:
MYSQL *getMySQL() { return &mysql; }
void SetMysql(MYSQL *mysql);
int8 GetConnectionType() const;
void SetConnectionType(int8 connection_type);
const std::string &GetOriginHost() const;
void SetOriginHost(const std::string &origin_host);
protected:
bool Open(
@@ -54,11 +51,12 @@ protected:
private:
bool Open(uint32 *errnum = nullptr, char *errbuf = nullptr);
int8 connection_type;
MYSQL mysql;
Mutex MDatabase;
eStatus pStatus;
std::string origin_host;
char *pHost;
char *pUser;
char *pPassword;