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

Fixed item_db parser:

Browse Source 
1. map server would crash with mismatching curly braces in unequip script field
2. the parser wouldn't accept specific combinations of curly braces in the uniquip script field.
special thanks to mkbu95!

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16878 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
shennetsind 2012-11-08 22:56:12 +00:00
parent 8d8cc71dab
commit 0a335475cd
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/map/itemdb.c
View File

@ -1171,12 +1171,22 @@ static int itemdb_readdb(void)
continue;
}
str[21] = p;
p = strstr(p+1,"}");
if ( strchr(p,',') != NULL )
{
ShowError("itemdb_readdb: Extra columns in line %d of \"%s\" (item with id %d), skipping.\n", lines, path, atoi(str[0]));
continue;
if ( str[21][strlen(str[21])-2] != '}' ) {
/* lets count to ensure it's not something silly e.g. a extra space at line ending */
int v, lcurly = 0, rcurly = 0;
for( v = 0; v < strlen(str[21]); v++ ) {
if( str[21][v] == '{' )
lcurly++;
else if ( str[21][v] == '}' )
rcurly++;
}
if( lcurly != rcurly ) {
ShowError("itemdb_readdb: Mismatching curly braces in line %d of \"%s\" (item with id %d), skipping.\n", lines, path, atoi(str[0]));
continue;
}
}
if (!itemdb_parse_dbrow(str, path, lines, 0))