Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverted f0aa0e5

Browse Source 
This commit fixed one problem, but actually broke a lot of other things.
This commit is contained in:
Lemongrass3110 2016-04-17 23:47:09 +02:00
parent 2e192b0406
commit 5070855f0a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/map/clif.c
View File

@ -9796,7 +9796,13 @@ static bool clif_process_message(struct map_session_data* sd, int format, char**
messagelen = textlen - NAME_LENGTH; // this should be the message length (w/ zero byte included) messagelen = textlen - NAME_LENGTH; // this should be the message length (w/ zero byte included)
} }
#if PACKETVER < 20151001 #if PACKETVER >= 20151001
if (message[messagelen-1] != '\0')
{
message[messagelen++] = '\0';
}
#endif
// the declared length must match real length // the declared length must match real length
if( messagelen != strnlen(message, messagelen)+1 ) { if( messagelen != strnlen(message, messagelen)+1 ) {
ShowWarning("clif_process_message: Received malformed packet from player '%s' (length is incorrect)!\n", sd->status.name); ShowWarning("clif_process_message: Received malformed packet from player '%s' (length is incorrect)!\n", sd->status.name);
@ -9808,7 +9814,6 @@ static bool clif_process_message(struct map_session_data* sd, int format, char**
ShowWarning("clif_process_message: Player '%s' sent an unterminated message string!\n", sd->status.name); ShowWarning("clif_process_message: Player '%s' sent an unterminated message string!\n", sd->status.name);
return false; return false;
} }
#endif
// messages mustn't be too long // messages mustn't be too long
if( messagelen > CHAT_SIZE_MAX-1 ) { if( messagelen > CHAT_SIZE_MAX-1 ) {