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

Merge pull request #1416 from ddnet/scopes

Browse source 
More SQL fixes
This commit is contained in:
Dennis Felsing 2019-01-06 10:51:26 +01:00 committed by GitHub
parent 2695cb101d a58ade137d
commit dfd12fb23e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/engine/server/sql_server.cpp
View file

@ -36,7 +36,15 @@ CSqlServer::~CSqlServer()
try try
{ {
if (m_pResults) if (m_pResults)
{
delete m_pResults; delete m_pResults;
m_pResults = 0;
}
if (m_pStatement)
{
delete m_pStatement;
m_pStatement = 0;
}
if (m_pConnection) if (m_pConnection)
{ {
delete m_pConnection; delete m_pConnection;
@ -120,7 +128,7 @@ bool CSqlServer::Connect()
} }
m_pConnection = m_pDriver->connect(connection_properties); m_pConnection = m_pDriver->connect(connection_properties);
// Create Statement // Create statement
m_pStatement = m_pConnection->createStatement(); m_pStatement = m_pConnection->createStatement();
if (m_SetUpDB) if (m_SetUpDB)
@ -200,16 +208,20 @@ void CSqlServer::CreateTables()
void CSqlServer::executeSql(const char *pCommand) void CSqlServer::executeSql(const char *pCommand)
{ {
scope_lock LockScope(&m_SqlLock);
m_pStatement->execute(pCommand); m_pStatement->execute(pCommand);
} }
void CSqlServer::executeSqlQuery(const char *pQuery) void CSqlServer::executeSqlQuery(const char *pQuery)
{ {
scope_lock LockScope(&m_SqlLock);
if (m_pResults) if (m_pResults)
{
delete m_pResults; delete m_pResults;
// set it to 0, so exceptions raised from executeQuery can not make m_pResults point to invalid memory
m_pResults = 0;
}
// set it to 0, so exceptions raised from executeQuery can not make m_pResults point to invalid memory
m_pResults = 0;
m_pResults = m_pStatement->executeQuery(pQuery); m_pResults = m_pStatement->executeQuery(pQuery);
} }