Dirty rotten .NET5 buggery

cinderblocks · Dec 21, 2021 · a2b25ee · a2b25ee
1 parent 2d5393f
commit a2b25ee
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/LibreMetaverse.Types/UtilsConversions.cs b/LibreMetaverse.Types/UtilsConversions.cs
@@ -25,6 +25,7 @@
  */
 
 using System;
+using System.Collections;
 using System.Linq;
 using System.Net;
 using System.Text;
@@ -745,8 +746,10 @@ public static string BytesToHexString(byte[] bytes, int length, string fieldName
         public static byte[] StringToBytes(string str)
         {
             if (string.IsNullOrEmpty(str)) { return EmptyBytes; }
-            if (!str.EndsWith("\0")) { str += "\0"; }
-            return Encoding.UTF8.GetBytes(str);
+            // HACK: Say it ain't so .NET5
+            return str.EndsWith("\0", StringComparison.Ordinal)
+                ? Encoding.UTF8.GetBytes(str) 
+                : Encoding.UTF8.GetBytes(str + '\0');
         }
 
         /// <summary>