From 0d06b767e34eff1f6782aae8acb55b7040c9f5ce Mon Sep 17 00:00:00 2001
From: xazax-hun <xazax-hun@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Fri, 23 Mar 2012 12:20:51 +0000
Subject: * Reading the itemDB checks for extra columns. * Fixed a typo in
 mobDB reading followup r15531. (bugreport:5482)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15784 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/itemdb.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/map/itemdb.c')

diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index 3523ea7ef..73ab0de91 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -959,6 +959,12 @@ static int itemdb_readdb(void)
 			}
 			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 (!itemdb_parse_dbrow(str, path, lines, 0))
 				continue;
-- 
cgit v1.2.3-60-g2f50