Backport of r135630

svn path=/branches/mono-2-4/mcs/; revision=135631

2 files changed, 15 insertions, 0 deletions

diff --git a/mcs/class/System.Configuration/System.Configuration/ChangeLog b/mcs/class/System.Configuration/System.Configuration/ChangeLog
index 2f64f36c4fa..6ae39cd0868 100644
--- a/mcs/class/System.Configuration/System.Configuration/ChangeLog
+++ b/mcs/class/System.Configuration/System.Configuration/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-08  Marek Habersack  <mhabersack@novell.com>
+
+	* ConfigurationLocation.cs: if the path passed to constructor
+	starts with any of ' ' '.' '/' or '\', throw an exception. Fixes
+	bug #510735
 
 2008-12-22 Gonzalo Paniagua Javier <gonzalo@novell.com>
 
diff --git a/mcs/class/System.Configuration/System.Configuration/ConfigurationLocation.cs b/mcs/class/System.Configuration/System.Configuration/ConfigurationLocation.cs
index f0109e9d2ad..b151da2d077 100644
--- a/mcs/class/System.Configuration/System.Configuration/ConfigurationLocation.cs
+++ b/mcs/class/System.Configuration/System.Configuration/ConfigurationLocation.cs
@@ -49,6 +49,16 @@ namespace System.Configuration {
 		
 		internal ConfigurationLocation (string path, string xmlContent, Configuration parent, bool allowOverride)
 		{
+			if (!String.IsNullOrEmpty (path)) {
+				switch (path [0]) {
+					case ' ':
+					case '.':
+					case '/':
+					case '\\':
+						throw new ConfigurationErrorsException ("<location> path attribute must be a relative virtual path.  It cannot start with any of ' ' '.' '/' or '\\'.");
+				}
+			}
+			
 			this.path = path;
 			this.xmlContent = xmlContent;
 			this.parent = parent;