srifqi/minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add player name length checks

Browse Source
This commit is contained in:
sapier 2014-08-22 14:03:04 +02:00
parent 8e9d896f2d
commit d7d8aa1039
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.cpp
View File

@ -79,6 +79,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "httpfetch.h" #include "httpfetch.h"
#include "guiEngine.h" #include "guiEngine.h"
#include "mapsector.h" #include "mapsector.h"
#include "player.h"
#include "database-sqlite3.h" #include "database-sqlite3.h"
#ifdef USE_LEVELDB #ifdef USE_LEVELDB
@ -1843,6 +1844,13 @@ int main(int argc, char *argv[])
break; 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 Run game
*/ */

19
src/server.cpp
View File

@ -1448,14 +1448,21 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
/* /*
Set up player Set up player
*/ */
// Get player name
char playername[PLAYERNAME_SIZE]; char playername[PLAYERNAME_SIZE];
for(u32 i=0; i<PLAYERNAME_SIZE-1; i++) unsigned int playername_length = 0;
{ for (; playername_length < PLAYERNAME_SIZE; playername_length++ ) {
playername[i] = data[3+i]; playername[playername_length] = data[3+playername_length];
if (data[3+playername_length] == 0)
break;
} }
playername[PLAYERNAME_SIZE-1] = 0;
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;
}
if(playername[0]=='\0') if(playername[0]=='\0')
{ {