aboutsummaryrefslogtreecommitdiff
path: root/src/trinitycore/RASocket.cpp
diff options
context:
space:
mode:
authorthenecromancer <none@none>2010-01-23 15:05:33 +0100
committerthenecromancer <none@none>2010-01-23 15:05:33 +0100
commit39ba392c7538db1bd18e617185c28420780e237c (patch)
treea620cd4b809816f697697af9478d6e538eb7cc5d /src/trinitycore/RASocket.cpp
parent76102c1cdd0fc8bb473f9b3fd3965cea5a3794f6 (diff)
parentd9cb0702158fd045285f2c0a904cb31a45a3864a (diff)
Merge
--HG-- branch : trunk
Diffstat (limited to 'src/trinitycore/RASocket.cpp')
-rw-r--r--src/trinitycore/RASocket.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/trinitycore/RASocket.cpp b/src/trinitycore/RASocket.cpp
index bed7fbf57ca..a55af0e270a 100644
--- a/src/trinitycore/RASocket.cpp
+++ b/src/trinitycore/RASocket.cpp
@@ -154,7 +154,7 @@ void RASocket::OnRead()
///- Escape the Login to allow quotes in names
loginDatabase.escape_string(login);
- QueryResult* result = loginDatabase.PQuery("SELECT a.id, aa.gmlevel, aa.RealmID FROM account a LEFT JOIN account_access aa ON (a.id = aa.id) WHERE a.username = '%s'",login.c_str ());
+ QueryResult_AutoPtr result = loginDatabase.PQuery("SELECT a.id, aa.gmlevel, aa.RealmID FROM account a LEFT JOIN account_access aa ON (a.id = aa.id) WHERE a.username = '%s'",login.c_str ());
///- If the user is not found, deny access
if(!result)
@@ -187,7 +187,6 @@ void RASocket::OnRead()
{
stage=LG;
}
- delete result;
}
}
break;
@@ -204,13 +203,12 @@ void RASocket::OnRead()
loginDatabase.escape_string(login);
loginDatabase.escape_string(pw);
- QueryResult *check = loginDatabase.PQuery(
+ QueryResult_AutoPtr check = loginDatabase.PQuery(
"SELECT 1 FROM account WHERE username = '%s' AND sha_pass_hash=SHA1(CONCAT('%s',':','%s'))",
login.c_str(), login.c_str(), pw.c_str());
if(check)
{
- delete check;
r=GetSocket();
stage=OK;
++iUsers;