Skip to content

[pull] master from rathena:master #269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Aug 4, 2026
Merged

[pull] master from rathena:master #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05eb830
Changed *mes script command declarations (#10076)
Stingor Aug 4, 2026
721f6ef
Fix Rodex mail length checks (#10027)
5nYqnHvk Aug 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions src/map/clif.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16831,8 +16831,13 @@ void clif_parse_Mail_send(int32 fd, map_session_data *sd){
mail_send(sd, RFIFOCP(fd,info->pos[1]), RFIFOCP(fd,info->pos[2]), RFIFOCP(fd,info->pos[4]), RFIFOB(fd,info->pos[3]));
#else
uint16 length = RFIFOW(fd, 2);
#if PACKETVER <= 20160330
constexpr uint16 headerLength = 64;
#else
constexpr uint16 headerLength = 68;
#endif

if( length < 0x3e ){
if( length < headerLength ){
ShowWarning("Too short...\n");
clif_Mail_send(sd, WRITE_MAIL_FAILED);
return;
Expand All @@ -16858,20 +16863,21 @@ void clif_parse_Mail_send(int32 fd, map_session_data *sd){
uint64 zeny = RFIFOQ(fd, 52);
uint16 titleLength = RFIFOW(fd, 60);
uint16 textLength = RFIFOW(fd, 62);

if( titleLength > length - headerLength || textLength > length - headerLength - titleLength ){
ShowWarning("Invalid Rodex mail content length from account %d.\n", sd->status.account_id);
clif_Mail_send(sd, WRITE_MAIL_FAILED);
return;
}

uint16 realTitleLength = min(titleLength, MAIL_TITLE_LENGTH);
uint16 realTextLength = min(textLength, MAIL_BODY_LENGTH);

char title[MAIL_TITLE_LENGTH];
char text[MAIL_BODY_LENGTH];

#if PACKETVER <= 20160330
safestrncpy(title, RFIFOCP(fd, 64), realTitleLength);
safestrncpy(text, RFIFOCP(fd, 64 + titleLength), realTextLength);
#else
// 64 = <char id>.L
safestrncpy(title, RFIFOCP(fd, 68), realTitleLength);
safestrncpy(text, RFIFOCP(fd, 68 + titleLength), realTextLength);
#endif
safestrncpy(title, RFIFOCP(fd, headerLength), realTitleLength);
safestrncpy(text, RFIFOCP(fd, headerLength + titleLength), realTextLength);

if( zeny > 0 ){
if( mail_setitem(sd,0,(uint32)zeny) != MAIL_ATTACH_SUCCESS ){
Expand Down
8 changes: 4 additions & 4 deletions src/map/script.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27927,7 +27927,7 @@ BUILDIN_FUNC(preg_match) {
/// for an explanation on args, see add_buildin_func
struct script_function buildin_func[] = {
// NPC interaction
BUILDIN_DEF(mes,"s*"),
BUILDIN_DEF(mes,"v*"),
BUILDIN_DEF(next,""),
BUILDIN_DEF(clear,""),
BUILDIN_DEF(close,""),
Expand Down Expand Up @@ -28121,8 +28121,8 @@ struct script_function buildin_func[] = {
BUILDIN_DEF(sc_end_class,"??"),
BUILDIN_DEF(getstatus, "i??"),
BUILDIN_DEF(getscrate,"ii?"),
BUILDIN_DEF(debugmes,"s"),
BUILDIN_DEF(errormes,"s"),
BUILDIN_DEF(debugmes,"v"),
BUILDIN_DEF(errormes,"v"),
BUILDIN_DEF2(catchpet,"pet","??"),
BUILDIN_DEF2(birthpet,"bpet",""),
BUILDIN_DEF(catchpet,"??"),
Expand Down Expand Up @@ -28230,7 +28230,7 @@ struct script_function buildin_func[] = {
BUILDIN_DEF(checkoption2,"i?"),
BUILDIN_DEF(guildgetexp,"i"),
BUILDIN_DEF(guildchangegm,"is"),
BUILDIN_DEF(logmes,"s"), //this command actls as MES but rints info into LOG file either SQL/TXT [Lupus]
BUILDIN_DEF(logmes,"v"), //this command actls as MES but rints info into LOG file either SQL/TXT [Lupus]
BUILDIN_DEF(summon,"si??"), // summons a slave monster [Celest]
BUILDIN_DEF(isnight,""), // check whether it is night time [Celest]
BUILDIN_DEF(isday,""), // check whether it is day time [Celest]
Expand Down
Loading