From cca953eb5fc5e8a40a183bc4f4adb48823f8683f Mon Sep 17 00:00:00 2001
From: David Hall <dahall@byu.net>
Date: Tue, 8 Oct 2019 13:29:30 -0600
Subject: [PATCH] Fixed bug #66 that forces all SafeMemString string
 representations to Empty when a size not known (like as a return value from a
 COM object).

---
 Core/InteropServices/SafeCoTaskMemString.cs | 3 +++
 Core/InteropServices/SafeMemString.cs       | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Core/InteropServices/SafeCoTaskMemString.cs b/Core/InteropServices/SafeCoTaskMemString.cs
index 8c0c0504..299a0520 100644
--- a/Core/InteropServices/SafeCoTaskMemString.cs
+++ b/Core/InteropServices/SafeCoTaskMemString.cs
@@ -37,6 +37,9 @@ namespace Vanara.InteropServices
 		{
 		}
 
+		/// <summary>Prevents a default instance of the <see cref="SafeCoTaskMemString"/> class from being created.</summary>
+		private SafeCoTaskMemString() : base() { }
+
 		/// <summary>Initializes a new instance of the <see cref="SafeCoTaskMemString"/> class.</summary>
 		/// <param name="ptr">The PTR.</param>
 		/// <param name="charSet">The character set.</param>
diff --git a/Core/InteropServices/SafeMemString.cs b/Core/InteropServices/SafeMemString.cs
index 9a50911c..5a040c86 100644
--- a/Core/InteropServices/SafeMemString.cs
+++ b/Core/InteropServices/SafeMemString.cs
@@ -186,6 +186,6 @@ namespace Vanara.InteropServices
 
 		/// <summary>Returns the string value held by this instance.</summary>
 		/// <returns>A <see cref="System.String"/> value held by this instance or <c>null</c> if the handle is invalid.</returns>
-		public override string ToString() => IsInvalid ? null : StringHelper.GetString(handle, CharSet, Size);
+		public override string ToString() => IsInvalid ? null : StringHelper.GetString(handle, CharSet, Size == 0 ? long.MaxValue : (long)Size);
 	}
 }
\ No newline at end of file