CORE: sanity check on charID of logging in char

DarkstarProject · Apr 23, 2014 · 794a2f6 · 794a2f6
1 parent 3f85391
commit 794a2f6
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/map/map.cpp b/src/map/map.cpp
@@ -435,9 +435,21 @@ int32 recv_parse(int8* buff, size_t* buffsize, sockaddr_in* from, map_session_da
 		{
 			uint32 CharID = RBUFL(buff,FFXI_HEADER_SIZE+0x0C);
 
-			const int8* fmtQuery = "SELECT session_key FROM accounts_sessions WHERE charid = %u LIMIT 1;";
+			const int8* fmtQuery = "SELECT charid FROM chars WHERE charid = %u LIMIT 1;";
 
-			int32 ret = Sql_Query(SqlHandle,fmtQuery,CharID);
+			int32 ret = Sql_Query(SqlHandle, fmtQuery, CharID);
+
+			if (ret == SQL_ERROR ||
+				Sql_NumRows(SqlHandle) == 0 ||
+				Sql_NextRow(SqlHandle) != SQL_SUCCESS)
+			{
+				ShowError(CL_RED"recv_parse: Cannot load charid %u" CL_RESET, CharID);
+				return -1;
+			}
+
+			fmtQuery = "SELECT session_key FROM accounts_sessions WHERE charid = %u LIMIT 1;";
+
+			ret = Sql_Query(SqlHandle,fmtQuery,CharID);
 
 			if (ret == SQL_ERROR ||
 				Sql_NumRows(SqlHandle) == 0 ||