edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix memory leaks

Browse source
This commit is contained in:
def 2013-08-08 01:47:49 +02:00
parent b567c32820
commit 33566a626c
2 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/base/system.c
View file

@ -703,12 +703,13 @@ int net_host_lookup(const char *hostname, NETADDR *addr, int types)
hints.ai_family = AF_INET6; hints.ai_family = AF_INET6;
e = getaddrinfo(host, NULL, &hints, &result); e = getaddrinfo(host, NULL, &hints, &result);
if(e != 0 || !result)
if(!result || e != 0)
return -1; return -1;
sockaddr_to_netaddr(result->ai_addr, addr); sockaddr_to_netaddr(result->ai_addr, addr);
freeaddrinfo(result);
addr->port = port; addr->port = port;
freeaddrinfo(result);
return 0; return 0;
} }

27
src/game/server/score/sql_score.cpp
View file

@ -23,6 +23,7 @@ CSqlScore::CSqlScore(CGameContext *pGameServer) : m_pGameServer(pGameServer),
m_pIp(g_Config.m_SvSqlIp), m_pIp(g_Config.m_SvSqlIp),
m_Port(g_Config.m_SvSqlPort) m_Port(g_Config.m_SvSqlPort)
{ {
m_pDriver = NULL;
str_copy(m_aMap, g_Config.m_SvMap, sizeof(m_aMap)); str_copy(m_aMap, g_Config.m_SvMap, sizeof(m_aMap));
NormalizeMapname(m_aMap); NormalizeMapname(m_aMap);
@ -87,10 +88,24 @@ CSqlScore::~CSqlScore()
delete m_PointsInfos; delete m_PointsInfos;
lock_wait(gs_SqlLock); lock_wait(gs_SqlLock);
lock_release(gs_SqlLock); lock_release(gs_SqlLock);
try
{
delete m_pStatement;
delete m_pConnection;
dbg_msg("SQL", "SQL connection disconnected");
}
catch (sql::SQLException &e)
{
dbg_msg("SQL", "ERROR: No SQL connection");
}
} }
bool CSqlScore::Connect() bool CSqlScore::Connect()
{ {
if (m_pDriver != NULL)
return true;
try try
{ {
// Create connection // Create connection
@ -98,6 +113,8 @@ bool CSqlScore::Connect()
char aBuf[256]; char aBuf[256];
str_format(aBuf, sizeof(aBuf), "tcp://%s:%d", m_pIp, m_Port); str_format(aBuf, sizeof(aBuf), "tcp://%s:%d", m_pIp, m_Port);
m_pConnection = m_pDriver->connect(aBuf, m_pUser, m_pPass); m_pConnection = m_pDriver->connect(aBuf, m_pUser, m_pPass);
bool Reconnect = true;
m_pConnection->setClientOption("MYSQL_OPT_RECONNECT", &Reconnect);
// Create Statement // Create Statement
m_pStatement = m_pConnection->createStatement(); m_pStatement = m_pConnection->createStatement();
@ -161,16 +178,6 @@ bool CSqlScore::Connect()
void CSqlScore::Disconnect() void CSqlScore::Disconnect()
{ {
try
{
delete m_pStatement;
delete m_pConnection;
dbg_msg("SQL", "SQL connection disconnected");
}
catch (sql::SQLException &e)
{
dbg_msg("SQL", "ERROR: No SQL connection");
}
} }
// create tables... should be done only once // create tables... should be done only once