Use LaxUtf8Marshaler when returning the blob as a string

Author: nulltoken

LibGit2Sharp/BlobExtensions.cs

@@ -22,7 +22,7 @@ public static string GetContentText(this Blob blob, Encoding encoding = null)
         {
             Ensure.ArgumentNotNull(blob, "blob");
 
-            return ReadToEnd(blob.GetContentStream, encoding);
+            return ReadToEnd(blob.GetContentStream(), encoding);
         }
 
         /// <summary>
@@ -40,12 +40,12 @@ public static string GetContentText(this Blob blob, FilteringOptions filteringOp
             Ensure.ArgumentNotNull(blob, "blob");
             Ensure.ArgumentNotNull(filteringOptions, "filteringOptions");
 
-            return ReadToEnd(() => blob.GetContentStream(filteringOptions), encoding);
+            return ReadToEnd(blob.GetContentStream(filteringOptions), encoding);
         }
 
-        private static string ReadToEnd(Func<Stream> streamProvider, Encoding encoding)
+        private static string ReadToEnd(Stream stream, Encoding encoding)
         {
-            using (var reader = new StreamReader(streamProvider(), encoding ?? Encoding.UTF8, encoding == null))
+            using (var reader = new StreamReader(stream, encoding ?? LaxUtf8Marshaler.Encoding, encoding == null))
             {
                 return reader.ReadToEnd();
             }

LibGit2Sharp/Core/Utf8Marshaler.cs

@@ -91,9 +91,9 @@ internal class LaxUtf8Marshaler : EncodingMarshaler
     {
         private static readonly LaxUtf8Marshaler staticInstance = new LaxUtf8Marshaler();
 
-        private static readonly Encoding encoding = new UTF8Encoding(false, false);
+        public static readonly Encoding Encoding = new UTF8Encoding(false, false);
 
-        public LaxUtf8Marshaler() : base(encoding)
+        public LaxUtf8Marshaler() : base(Encoding)
         { }
 
         public static ICustomMarshaler GetInstance(String cookie)
@@ -113,22 +113,22 @@ public override IntPtr MarshalManagedToNative(object managedObj)
 
         public static string FromNative(IntPtr pNativeData)
         {
-            return FromNative(encoding, pNativeData);
+            return FromNative(Encoding, pNativeData);
         }
 
         public static string FromNative(IntPtr pNativeData, int length)
         {
-            return FromNative(encoding, pNativeData, length);
+            return FromNative(Encoding, pNativeData, length);
         }
 
         public static string FromBuffer(byte[] buffer)
         {
-            return FromBuffer(encoding, buffer);
+            return FromBuffer(Encoding, buffer);
         }
 
         public static string FromBuffer(byte[] buffer, int length)
         {
-            return FromBuffer(encoding, buffer, length);
+            return FromBuffer(Encoding, buffer, length);
         }
     }
 }