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

map-server: return-type-fix clif_validate_emblem was declared to return bool but actually returned int-value

Browse Source
This commit is contained in:
Florian Wilkemeyer 2016-05-07 22:17:25 +02:00
parent c6ba347a54
commit d2ded889cb
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/map/clif.c
View File

@ -13181,7 +13181,13 @@ void clif_parse_GuildRequestEmblem(int fd,struct map_session_data *sd)
/// Validates data of a guild emblem (compressed bitmap) /// Validates data of a guild emblem (compressed bitmap)
static bool clif_validate_emblem(const uint8* emblem, unsigned long emblem_len) enum e_result_validate_emblem { // Used as Result for clif_validate_emblem
EMBVALIDATE_SUCCESS = 0,
EMBVALIDATE_ERR_RAW_FILEFORMAT, // Invalid File Format (Error in zlib/decompression or malformed BMP header)
EMBVALIDATE_ERR_TRANSPARENCY // uploaded emblem does not met the requirements of battle_config.emblem_transparency_limit
};
static enum e_result_validate_emblem clif_validate_emblem(const uint8* emblem, unsigned long emblem_len)
{ {
uint8 buf[1800]; // no well-formed emblem bitmap is larger than 1782 (24 bit) / 1654 (8 bit) bytes uint8 buf[1800]; // no well-formed emblem bitmap is larger than 1782 (24 bit) / 1654 (8 bit) bytes
unsigned long buf_len = sizeof(buf); unsigned long buf_len = sizeof(buf);
@ -13192,7 +13198,7 @@ static bool clif_validate_emblem(const uint8* emblem, unsigned long emblem_len)
&& RBUFL(buf,2) == buf_len // BITMAPFILEHEADER.bfSize (file size) && RBUFL(buf,2) == buf_len // BITMAPFILEHEADER.bfSize (file size)
&& (offset = RBUFL(buf,10)) < buf_len // BITMAPFILEHEADER.bfOffBits (offset to bitmap bits) && (offset = RBUFL(buf,10)) < buf_len // BITMAPFILEHEADER.bfOffBits (offset to bitmap bits)
)) ))
return -1; return EMBVALIDATE_ERR_RAW_FILEFORMAT;
if(battle_config.emblem_transparency_limit != 100) { if(battle_config.emblem_transparency_limit != 100) {
int i, transcount = 1, tmp[3]; int i, transcount = 1, tmp[3];
@ -13203,10 +13209,10 @@ static bool clif_validate_emblem(const uint8* emblem, unsigned long emblem_len)
transcount++; transcount++;
} }
if(((transcount*300)/(buf_len-offset)) > battle_config.emblem_transparency_limit) //convert in % to chk if(((transcount*300)/(buf_len-offset)) > battle_config.emblem_transparency_limit) //convert in % to chk
return -2; return EMBVALIDATE_ERR_TRANSPARENCY;
} }
return 0; return EMBVALIDATE_SUCCESS;
} }
@ -13226,11 +13232,11 @@ void clif_parse_GuildChangeEmblem(int fd,struct map_session_data *sd){
return; return;
} }
emb_val = clif_validate_emblem(emblem, emblem_len); emb_val = clif_validate_emblem(emblem, emblem_len);
if(emb_val ==-1 ){ if(emb_val == EMBVALIDATE_ERR_RAW_FILEFORMAT){
ShowWarning("clif_parse_GuildChangeEmblem: Rejected malformed guild emblem (size=%lu, accound_id=%d, char_id=%d, guild_id=%d).\n", emblem_len, sd->status.account_id, sd->status.char_id, sd->status.guild_id); ShowWarning("clif_parse_GuildChangeEmblem: Rejected malformed guild emblem (size=%lu, accound_id=%d, char_id=%d, guild_id=%d).\n", emblem_len, sd->status.account_id, sd->status.char_id, sd->status.guild_id);
clif_colormes(sd->fd,color_table[COLOR_RED],msg_txt(sd,386)); //"The chosen emblem was detected invalid\n" clif_colormes(sd->fd,color_table[COLOR_RED],msg_txt(sd,386)); //"The chosen emblem was detected invalid\n"
return; return;
} else if(emb_val == -2){ } else if(emb_val == EMBVALIDATE_ERR_TRANSPARENCY){
char output[128]; char output[128];
safesnprintf(output,sizeof(output),msg_txt(sd,387),battle_config.emblem_transparency_limit); safesnprintf(output,sizeof(output),msg_txt(sd,387),battle_config.emblem_transparency_limit);
clif_colormes(sd->fd,color_table[COLOR_RED],output); //"The chosen emblem was detected invalid as it contain too much transparency (limit=%d)\n" clif_colormes(sd->fd,color_table[COLOR_RED],output); //"The chosen emblem was detected invalid as it contain too much transparency (limit=%d)\n"