Merge pull request #355 from marshall-lerner/main

Make sure that the only real paths get resolved

2 files changed, 27 insertions, 0 deletions

diff --git a/Mono.Debugging/Mono.Debugging.Client/BreakpointStore.cs b/Mono.Debugging/Mono.Debugging.Client/BreakpointStore.cs
index 883e169..f853183 100644
--- a/Mono.Debugging/Mono.Debugging.Client/BreakpointStore.cs
+++ b/Mono.Debugging/Mono.Debugging.Client/BreakpointStore.cs
@@ -471,8 +471,17 @@ namespace Mono.Debugging.Client
 		[DllImport ("libc")]
 		static extern IntPtr realpath (string path, IntPtr buffer);
 
+		/// <summary>
+		/// Resolves the full path of the given file
+		/// </summary>
+		/// <param name="path"></param>
+		/// <returns>The full path if a file is given, or returns the parameter if it is null or empty</returns>
 		static string ResolveFullPath (string path)
 		{
+			// If there is no path given, return the same path back
+			if (string.IsNullOrEmpty (path))
+				return path;
+
 			if (IsWindows)
 				return Path.GetFullPath (path);
 
diff --git a/UnitTests/Mono.Debugging.Tests/Shared/BreakpointsAndSteppingTests.cs b/UnitTests/Mono.Debugging.Tests/Shared/BreakpointsAndSteppingTests.cs
index ced8211..5f61924 100644
--- a/UnitTests/Mono.Debugging.Tests/Shared/BreakpointsAndSteppingTests.cs
+++ b/UnitTests/Mono.Debugging.Tests/Shared/BreakpointsAndSteppingTests.cs
@@ -1317,5 +1317,23 @@ namespace Mono.Debugging.Tests
 			Assert.AreEqual (1, bps.Count);
 			Assert.AreEqual (Path.Combine(Environment.CurrentDirectory, "fileName2.cs"), bps [0].FileName);
 		}
+
+		[Test]
+		public void NullFileName ()
+		{
+			var store = new BreakpointStore ();
+			store.Add (new Breakpoint (null, 10));
+			var bps = store.GetBreakpoints ();
+			Assert.AreEqual (1, bps.Count);
+		}
+
+		[Test]
+		public void EmptyFileName ()
+		{
+			var store = new BreakpointStore ();
+			store.Add (new Breakpoint ("", 10));
+			var bps = store.GetBreakpoints ();
+			Assert.AreEqual (1, bps.Count);
+		}
 	}
 }