ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always call sqlite3_finalize to avoid deadlock

Browse Source
This commit is contained in:
Benau 2019-05-10 15:35:02 +08:00
parent 21a23dc9e6
commit 66c34c7443
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/network/protocols/server_lobby.cpp
View File

@ -790,6 +790,7 @@ std::string ServerLobby::ip2Country(const TransportAddress& addr) const
if (!m_db || !m_ip_geolocation_table_exists || addr.isLAN())
return "";
std::string cc_code;
std::string query = StringUtils::insertValues(
"SELECT country_code FROM %s "
"WHERE `ip_start` <= %d AND `ip_end` >= %d "
@ -805,7 +806,7 @@ std::string ServerLobby::ip2Country(const TransportAddress& addr) const
if (ret == SQLITE_ROW)
{
const char* country_code = (char*)sqlite3_column_text(stmt, 0);
return std::string(country_code);
cc_code = country_code;
}
ret = sqlite3_finalize(stmt);
if (ret != SQLITE_OK)
@ -821,7 +822,7 @@ std::string ServerLobby::ip2Country(const TransportAddress& addr) const
query.c_str(), sqlite3_errmsg(m_db));
return "";
}
return "";
return cc_code;
} // ip2Country
#endif