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

Removes nullpo checks from CSV2YAML (#4979)

Browse Source 
* Fixes #4791.
* Removes two nullpo checks from CSV2YAML.
* Fixes undefined reference compile errors.
Thanks to @ecdarreola!
This commit is contained in:
Aleos 2020-05-20 18:09:44 -04:00 committed by GitHub
parent a34a2f6de0
commit 20945d71db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tool/csv2yaml.cpp
View File

@ -150,7 +150,8 @@ void script_set_constant_( const char* name, int64 value, const char* constant_n
}
const char* constant_lookup( int32 value, const char* prefix ){
nullpo_retr( nullptr, prefix );
if (prefix == nullptr)
return nullptr;
for( auto const& pair : constants ){
// Same prefix group and same value
@ -163,7 +164,8 @@ const char* constant_lookup( int32 value, const char* prefix ){
}
int64 constant_lookup_int(const char* constant) {
nullpo_retr(-100, constant);
if (constant == nullptr)
return -100;
for (auto const &pair : constants) {
if (strlen(pair.first) == strlen(constant) && strncasecmp(pair.first, constant, strlen(constant)) == 0) {