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

Fix stack overflow in npc_parse_shop (#8496)

Browse Source
This commit is contained in:
Vincent Stumpf 2024-07-07 02:24:53 -07:00 committed by GitHub
parent f8c9481673
commit 3b1c33c5d9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/map/npc.cpp
View File

@ -4028,7 +4028,7 @@ static const char* npc_parse_shop(char* w1, char* w2, char* w3, char* w4, const
break;
}
case NPCTYPE_POINTSHOP: {
if (sscanf(p, ",%32[^,:]:%11d,",point_str,&is_discount) < 1) {
if (sscanf(p, ",%31[^,:]:%11d,",point_str,&is_discount) < 1) {
ShowError("npc_parse_shop: Invalid item cost definition in file '%s', line '%d'. Ignoring the rest of the line...\n * w1=%s\n * w2=%s\n * w3=%s\n * w4=%s\n", filepath, strline(buffer,start-buffer), w1, w2, w3, w4);
return strchr(start,'\n'); // skip and continue
}
@ -4056,7 +4056,7 @@ static const char* npc_parse_shop(char* w1, char* w2, char* w3, char* w4, const
break;
#endif
default:
if( sscanf( p, ",%32[^,:]:%11d,", point_str, &is_discount ) == 2 ){
if( sscanf( p, ",%31[^,:]:%11d,", point_str, &is_discount ) == 2 ){
is_discount = 1;
}else{
if( !strcasecmp( point_str, "yes" ) ){