Merge pull request #7 from codepwner/patch-2

Trim Null Padded Variable Names
siisltd · Nov 13, 2023 · 79ef5ee · 79ef5ee
2 parents 2785794 + 042048c
commit 79ef5ee
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Curiosity.SPSS/FileParser/Records/EncodingExtensions.cs b/src/Curiosity.SPSS/FileParser/Records/EncodingExtensions.cs
@@ -9,7 +9,7 @@ namespace Curiosity.SPSS.FileParser.Records
     internal static class EncodingExtensions
     {
         /// <summary>
-        /// Gets a decoded string, with trailing spaces trimmed out
+        /// Gets a decoded string, with trailing spaces and null characters trimmed out
         /// </summary>
         internal static string GetTrimmed(this Encoding enc, byte[] arr)
         {
@@ -23,7 +23,7 @@ internal static string GetTrimmed(this Encoding enc, byte[] arr)
                 throw new ArgumentNullException(nameof(arr));
             }
 
-            return enc.GetString(arr).TrimEnd();
+            return enc.GetString(arr).TrimEnd('\0').TrimEnd();
         }
 
 
@@ -218,4 +218,4 @@ private static byte[] GetPaddedByteArray(Encoding enc, int length, byte padding,
             return byteArr;
         }
     }
-}
+}