Merge with develop

This commit is contained in:
kervala 2016-10-18 17:50:19 +02:00
parent 54c7e89e05
commit e5d8439a1d

View file

@ -380,11 +380,11 @@ void clientAuthentication(CMessage &msgin, TSockId from, CCallbackNetBase &netba
if (!Clients[i]->BadLogin) // don't allow new login attempt while this flag is set
{
// escape login
char esccapedLogin[100];
size_t len = mysql_real_escape_string(DatabaseConnection, esccapedLogin, login.c_str(), login.length());
char escapedLogin[100];
size_t len = mysql_real_escape_string(DatabaseConnection, escapedLogin, login.c_str(), login.length());
// make a db request to to db to see if password is valid
std::string queryStr = toString("SELECT Password FROM user where Login='%s'", esccapedLogin);
std::string queryStr = toString("SELECT Password FROM user where Login='%s'", escapedLogin);
int result = mysql_query(DatabaseConnection, queryStr.c_str());
if (result == 0)
{