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

Fixed some potential csv2yaml crashes (#5557)

Browse Source 
Fixes #5549

Thanks to @Atemo
This commit is contained in:
Lemongrass3110 2020-11-17 11:51:01 +01:00 committed by GitHub
parent 9cdc008bfe
commit 602c6035e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/tool/csv2yaml.cpp
View File

@ -3074,11 +3074,33 @@ static bool itemdb_read_db(const char* file) {
int type = atoi(str[3]), subtype = atoi(str[18]);
body << YAML::Key << "Type" << YAML::Value << name2Upper(constant_lookup(type, "IT_") + 3);
if (type == IT_WEAPON && subtype)
body << YAML::Key << "SubType" << YAML::Value << name2Upper(constant_lookup(subtype, "W_") + 2);
else if (type == IT_AMMO && subtype)
body << YAML::Key << "SubType" << YAML::Value << name2Upper(constant_lookup(subtype, "AMMO_") + 5);
const char* constant = constant_lookup( type, "IT_" );
if( constant == nullptr ){
ShowError( "itemdb_read_db: Unknown item type %d for item %u, skipping.\n", type, nameid );
continue;
}
body << YAML::Key << "Type" << YAML::Value << name2Upper( constant + 3 );
if( type == IT_WEAPON && subtype ){
constant = constant_lookup( subtype, "W_" );
if( constant == nullptr ){
ShowError( "itemdb_read_db: Unknown weapon type %d for item %u, skipping.\n", subtype, nameid );
continue;
}
body << YAML::Key << "SubType" << YAML::Value << name2Upper( constant + 2 );
}else if( type == IT_AMMO && subtype ){
constant = constant_lookup( subtype, "AMMO_" );
if( constant == nullptr ){
ShowError( "itemdb_read_db: Unknown ammo type %d for item %u, skipping.\n", subtype, nameid );
continue;
}
body << YAML::Key << "SubType" << YAML::Value << name2Upper(constant + 5);
}
if (atoi(str[4]) > 0)
body << YAML::Key << "Buy" << YAML::Value << atoi(str[4]);