From 55a095e9249cb6a87f5d6f7e50572ef3ad46dcff Mon Sep 17 00:00:00 2001
From: Daniel De Graaf
Date: Tue, 23 Mar 2010 09:50:49 -0500
Subject: Fail config parse if duplicate keys are found

---
 src/configparser.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/configparser.cpp')

diff --git a/src/configparser.cpp b/src/configparser.cpp
index 3b4b743ab..e23da82f9 100644
--- a/src/configparser.cpp
+++ b/src/configparser.cpp
@@ -84,7 +84,7 @@ struct Parser
 		unget(ch);
 	}
 
-	bool kv(std::vector<KeyVal>* items)
+	bool kv(std::vector<KeyVal>* items, std::set<std::string>& seen)
 	{
 		std::string key;
 		nextword(key);
@@ -149,6 +149,10 @@ struct Parser
 			else
 				value.push_back(ch);
 		}
+
+		if (!seen.insert(key).second)
+			throw CoreException("Duplicate key '" + key + "' found");
+
 		items->push_back(KeyVal(key, value));
 		return true;
 	}
@@ -169,9 +173,10 @@ struct Parser
 			throw CoreException("Empty tag name");
 
 		std::vector<KeyVal>* items;
+		std::set<std::string> seen;
 		tag = ConfigTag::create(name, current.filename, current.line, items);
 
-		while (kv(items));
+		while (kv(items, seen));
 
 		if (name == "include")
 		{
-- 
cgit v1.3.1-10-gc9f91