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

Fixed a Zeny variable overflow in mails (#8145)

Browse Source 
Fix the issue of Zeny variable overflow causing it to become negative.

Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
This commit is contained in:
inhyositsu 2024-02-28 08:49:15 +08:00 committed by GitHub
parent d4ec7eb241
commit 398bae57a8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/map/mail.cpp
View File

@ -7,6 +7,7 @@
#include <common/showmsg.hpp>
#include <common/strlib.hpp>
#include <common/timer.hpp>
#include <common/utilities.hpp>
#include "atcommand.hpp"
#include "battle.hpp"
@ -18,6 +19,8 @@
#include "pc.hpp"
#include "pet.hpp"
using namespace rathena;
void mail_clear(map_session_data *sd)
{
int i;
@ -106,8 +109,36 @@ bool mail_removezeny( map_session_data *sd, bool flag ){
if( sd->mail.zeny > 0 ){
//Zeny send
if( flag ){
int64 zeny = sd->mail.zeny;
if( battle_config.mail_zeny_fee > 0 ){
int64 fee;
if( util::safe_multiplication( zeny, static_cast<decltype(fee)>( battle_config.mail_zeny_fee ), fee ) ){
return false;
}
if( fee < 0 ){
return false;
}
fee /= 100;
if( fee > MAX_ZENY ){
return false;
}
if( util::safe_addition( zeny, fee, zeny ) ){
return false;
}
if( zeny > MAX_ZENY ){
return false;
}
}
// It's possible that we don't know what the dest_id is, so it will be 0
if (pc_payzeny(sd, sd->mail.zeny + sd->mail.zeny * battle_config.mail_zeny_fee / 100, LOG_TYPE_MAIL, sd->mail.dest_id)) {
if( pc_payzeny( sd, static_cast<int32>( zeny ), LOG_TYPE_MAIL, sd->mail.dest_id ) ){
return false;
}
}else{