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

Fixed chrif_authreq possible crash, bugreport:5337

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15595 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
shennetsind 2012-02-17 16:56:02 +00:00
parent c99d6a3e95
commit 2856e2f729
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/map/chrif.c
View File

@ -275,8 +275,7 @@ int chrif_save(struct map_session_data *sd, int flag)
ShowError("chrif_save: Failed to set up player %d:%d for proper quitting!\n", sd->status.account_id, sd->status.char_id); ShowError("chrif_save: Failed to set up player %d:%d for proper quitting!\n", sd->status.account_id, sd->status.char_id);
} }
if(!chrif_isconnected()) chrif_check(-1); //Character is saved on reconnect.
return -1; //Character is saved on reconnect.
//For data sync //For data sync
if (sd->state.storage_flag == 2) if (sd->state.storage_flag == 2)
@ -552,8 +551,7 @@ void chrif_authreq(struct map_session_data *sd)
{ {
struct auth_node *node= chrif_search(sd->bl.id); struct auth_node *node= chrif_search(sd->bl.id);
if( node != NULL ) if( node != NULL || !chrif_isconnected() ) {
{
set_eof(sd->fd); set_eof(sd->fd);
return; return;
} }
@ -692,9 +690,8 @@ int auth_db_cleanup_sub(DBKey key,void *data,va_list ap)
return 0; return 0;
} }
int auth_db_cleanup(int tid, unsigned int tick, int id, intptr_t data) int auth_db_cleanup(int tid, unsigned int tick, int id, intptr_t data) {
{ chrif_check(0);
if(!chrif_isconnected()) return 0;
auth_db->foreach(auth_db, auth_db_cleanup_sub); auth_db->foreach(auth_db, auth_db_cleanup_sub);
return 0; return 0;
} }