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

Corrected item_db script curly parsing (#2998)

Browse Source 
* Fixes #2964
* Correctly finds the last right curly.
Thanks to @ecdarreola
This commit is contained in:
Vincent Stumpf
2018-04-07 15:32:59 -07:00
committed by GitHub
parent 7f2c6cf2f5
commit ec1470b613
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/map/itemdb.cpp
View File

@@ -1484,7 +1484,7 @@ static int itemdb_readdb(void){
ShowError("itemdb_readdb: Invalid format (OnUnequip_Script column) in line %d of \"%s\" (item with id %d), skipping.\n", lines, path, atoi(str[0]));
continue;
}
str[21] = p + 1;
str[21] = p;
p = &str[21][strlen(str[21]) - 2];
if ( *p != '}' ) {
@@ -1494,8 +1494,10 @@ static int itemdb_readdb(void){
for( v = 0; v < strlen(str[21]); v++ ) {
if( str[21][v] == '{' )
lcurly++;
else if ( str[21][v] == '}' )
else if (str[21][v] == '}') {
rcurly++;
p = &str[21][v];
}
}
if( lcurly != rcurly ) {
@@ -1503,7 +1505,8 @@ static int itemdb_readdb(void){
continue;
}
}
*p = '\0';
str[21] = str[21] + 1; //skip the first left curly
*p = '\0'; //null the last right curly
if (!itemdb_parse_dbrow(str, path, lines, SCRIPT_IGNORE_EXTERNAL_BRACKETS))
continue;