Skip to content

Commit

Permalink
Add missing checks into chrif.c
Browse files Browse the repository at this point in the history
  • Loading branch information
@4144
4144 committed Sep 14, 2015
1 parent 897c2ad commit bb00377
Showing 1 changed file with 27 additions and 4 deletions.
31 changes: 27 additions & 4 deletions src/map/chrif.c
View file
Expand Up @@ -150,6 +150,7 @@ bool chrif_auth_delete(int account_id, int char_id, enum sd_state state) {
bool chrif_sd_to_auth(TBL_PC* sd, enum sd_state state) {
struct auth_node *node;

nullpo_retr(false, sd);
if ( chrif->search(sd->status.account_id) )
return false; //Already exists?

Expand All @@ -176,6 +177,7 @@ bool chrif_sd_to_auth(TBL_PC* sd, enum sd_state state) {

bool chrif_auth_logout(TBL_PC* sd, enum sd_state state)
{
nullpo_retr(false, sd);
if(sd->fd && state == ST_LOGOUT) { //Disassociate player, and free it after saving ack returns. [Skotlex]
//fd info must not be lost for ST_MAPCHANGE as a final packet needs to be sent to the player.
if ( sockt->session[sd->fd] )
Expand All @@ -187,8 +189,10 @@ bool chrif_auth_logout(TBL_PC* sd, enum sd_state state)
}

bool chrif_auth_finished(TBL_PC* sd) {
struct auth_node *node= chrif->search(sd->status.account_id);
struct auth_node *node;

nullpo_retr(false, sd);
node = chrif->search(sd->status.account_id);
if ( node && node->sd == sd && node->state == ST_LOGIN ) {
node->sd = NULL;

Expand All @@ -197,13 +201,16 @@ bool chrif_auth_finished(TBL_PC* sd) {

return false;
}

// sets char-server's user id
void chrif_setuserid(char *id) {
nullpo_retv(id);
memcpy(chrif->userid, id, NAME_LENGTH);
}

// sets char-server's password
void chrif_setpasswd(char *pwd) {
nullpo_retv(pwd);
memcpy(chrif->passwd, pwd, NAME_LENGTH);
}

Expand All @@ -220,6 +227,7 @@ void chrif_checkdefaultlogin(void) {
bool chrif_setip(const char* ip) {
char ip_str[16];

nullpo_retr(false, ip);
if (!(chrif->ip = sockt->host2ip(ip))) {
ShowWarning("Failed to Resolve Char Server Address! (%s)\n", ip);
return false;
Expand Down Expand Up @@ -446,6 +454,7 @@ void chrif_connectack(int fd) {
int chrif_reconnect(DBKey key, DBData *data, va_list ap) {
struct auth_node *node = DB->data2ptr(data);

nullpo_ret(node);
switch (node->state) {
case ST_LOGIN:
if ( node->sd ) {//Since there is no way to request the char auth, make it fail.
Expand Down Expand Up @@ -542,6 +551,7 @@ bool chrif_scdata_request(int account_id, int char_id)
void chrif_authreq(struct map_session_data *sd, bool hstandalone) {
struct auth_node *node= chrif->search(sd->bl.id);

nullpo_retv(sd);
if( node != NULL || !chrif->isconnected() ) {
sockt->eof(sd->fd);
return;
Expand Down Expand Up @@ -657,6 +667,7 @@ void chrif_authfail(int fd) {/* HELLO WORLD. ip in RFIFOL 15 is not being used (
int auth_db_cleanup_sub(DBKey key, DBData *data, va_list ap) {
struct auth_node *node = DB->data2ptr(data);

nullpo_retr(1, node);
if(DIFF_TICK(timer->gettick(),node->node_created)>60000) {
const char* states[] = { "Login", "Logout", "Map change" };
switch (node->state) {
Expand Down Expand Up @@ -732,6 +743,8 @@ bool chrif_changeemail(int id, const char *actual_email, const char *new_email)
if (battle_config.etc_log)
ShowInfo("chrif_changeemail: account: %d, actual_email: '%s', new_email: '%s'.\n", id, actual_email, new_email);

nullpo_retr(false, actual_email);
nullpo_retr(false, new_email);
chrif_check(false);

WFIFOHEAD(chrif->fd,86);
Expand Down Expand Up @@ -760,6 +773,7 @@ bool chrif_changeemail(int id, const char *actual_email, const char *new_email)
*------------------------------------------*/
bool chrif_char_ask_name(int acc, const char* character_name, unsigned short operation_type, int year, int month, int day, int hour, int minute, int second)
{
nullpo_retr(false, character_name);
chrif_check(false);

WFIFOHEAD(chrif->fd,44);
Expand Down Expand Up @@ -790,6 +804,7 @@ bool chrif_char_ask_name(int acc, const char* character_name, unsigned short ope
*/
bool chrif_changesex(struct map_session_data *sd, bool change_account)
{
nullpo_retr(false, sd);
chrif_check(false);

WFIFOHEAD(chrif->fd,44);
Expand Down Expand Up @@ -822,6 +837,7 @@ bool chrif_char_ask_name_answer(int acc, const char* player_name, uint16 type, u
char output[256];
bool charsrv = ( type == CHAR_ASK_NAME_CHARBAN || type == CHAR_ASK_NAME_CHARUNBAN ) ? true : false;

nullpo_retr(false, player_name);
sd = map->id2sd(acc);

if( acc < 0 || sd == NULL ) {
Expand Down Expand Up @@ -1025,6 +1041,7 @@ int chrif_disconnectplayer(int fd) {
int chrif_updatefamelist(struct map_session_data* sd) {
char type;

nullpo_retr(0, sd);
chrif_check(-1);

switch(sd->class_ & MAPID_UPPERMASK) {
Expand Down Expand Up @@ -1115,9 +1132,11 @@ bool chrif_save_scdata(struct map_session_data *sd) { //parses the sc_data of th
int i, count=0;
int64 tick;
struct status_change_data data;
struct status_change *sc = &sd->sc;
struct status_change *sc;
const struct TimerData *td;

nullpo_retr(false, sd);
sc = &sd->sc;
chrif_check(false);
tick = timer->gettick();

Expand Down Expand Up @@ -1254,11 +1273,12 @@ bool chrif_char_reset_offline(void) {
}

/*=========================================
* Tell char-server character is online [Wizputer]
* Tell char-server character is online [Wizputer]. Look like unused.
*-----------------------------------------*/
bool chrif_char_online(struct map_session_data *sd) {
chrif_check(false);

nullpo_retr(false, sd);
WFIFOHEAD(chrif->fd,10);
WFIFOW(chrif->fd,0) = 0x2b19;
WFIFOL(chrif->fd,2) = sd->status.char_id;
Expand Down Expand Up @@ -1523,6 +1543,7 @@ bool chrif_removefriend(int char_id, int friend_id)
void chrif_send_report(char* buf, int len) {
#ifndef STATS_OPT_OUT
if( chrif->fd > 0 ) {
nullpo_retv(buf);
WFIFOHEAD(chrif->fd,len + 2);

WFIFOW(chrif->fd,0) = 0x3008;
Expand All @@ -1543,6 +1564,7 @@ void chrif_save_scdata_single(int account_id, int char_id, short type, struct st
if( !chrif->isconnected() )
return;

nullpo_retv(sce);
WFIFOHEAD(chrif->fd, 28);

WFIFOW(chrif->fd, 0) = 0x2740;
Expand Down Expand Up @@ -1582,6 +1604,7 @@ void chrif_del_scdata_single(int account_id, int char_id, short type)
int auth_db_final(DBKey key, DBData *data, va_list ap) {
struct auth_node *node = DB->data2ptr(data);

nullpo_ret(node);
if (node->sd) {
if( node->sd->regs.vars )
node->sd->regs.vars->destroy(node->sd->regs.vars, script->reg_destroy);
Expand Down Expand Up @@ -1706,7 +1729,7 @@ void chrif_defaults(void) {
chrif->char_offline_nsd = chrif_char_offline_nsd;
chrif->char_reset_offline = chrif_char_reset_offline;
chrif->send_users_tochar = send_users_tochar;
chrif->char_online = chrif_char_online;
chrif->char_online = chrif_char_online; // look like unused
chrif->changesex = chrif_changesex;
//chrif->chardisconnect = chrif_chardisconnect;
chrif->divorce = chrif_divorce;
Expand Down

0 comments on commit bb00377

Please sign in to comment.