Skip to content
Permalink
Browse files

Add player name length checks

  • Loading branch information
sapier sapier
sapier authored and sapier committed Aug 22, 2014
1 parent 8e9d896 commit d7d8aa1039e898dd37fcd8fa01d7f13c5452b43d
Showing with 21 additions and 6 deletions.
  1. +8 −0 src/main.cpp
  2. +13 −6 src/server.cpp
@@ -79,6 +79,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "httpfetch.h"
#include "guiEngine.h"
#include "mapsector.h"
#include "player.h"

#include "database-sqlite3.h"
#ifdef USE_LEVELDB
@@ -1843,6 +1844,13 @@ int main(int argc, char *argv[])
break;
}

if (current_playername.length() > PLAYERNAME_SIZE-1) {
error_message = wgettext("Player name to long.");
playername = current_playername.substr(0,PLAYERNAME_SIZE-1);
g_settings->set("name", playername);
continue;
}

/*
Run game
*/
@@ -1448,14 +1448,21 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
/*
Set up player
*/

// Get player name
char playername[PLAYERNAME_SIZE];
for(u32 i=0; i<PLAYERNAME_SIZE-1; i++)
{
playername[i] = data[3+i];
unsigned int playername_length = 0;
for (; playername_length < PLAYERNAME_SIZE; playername_length++ ) {
playername[playername_length] = data[3+playername_length];
if (data[3+playername_length] == 0)
break;
}

if (playername_length == PLAYERNAME_SIZE) {
actionstream<<"Server: Player with name exceeding max length "
<<"tried to connect from "<<addr_s<<std::endl;
DenyAccess(peer_id, L"Name to long");
return;
}
playername[PLAYERNAME_SIZE-1] = 0;


if(playername[0]=='\0')
{

0 comments on commit d7d8aa1

Please sign in to comment.
You can’t perform that action at this time.