From a35a9a4ab62d226077bc28622837f81a545d7b46 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Fri, 15 Sep 2023 00:23:03 -0400
Subject: [PATCH] Add byte array to encoding extension

---
 BinaryObjectScanner.Printing/Extensions.cs    | 13 +++++++++++++
 BinaryObjectScanner.Printing/NewExecutable.cs |  8 ++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/BinaryObjectScanner.Printing/Extensions.cs b/BinaryObjectScanner.Printing/Extensions.cs
index 20839ee4..a10a28a8 100644
--- a/BinaryObjectScanner.Printing/Extensions.cs
+++ b/BinaryObjectScanner.Printing/Extensions.cs
@@ -18,6 +18,19 @@ namespace BinaryObjectScanner.Printing
             return sb.AppendLine($"{prefixString}: {valueString}");
         }
 
+                /// <summary>
+        /// Append a line containing a UInt8[] value as a string to a StringBuilder
+        /// </summary>
+#if NET48
+        public static StringBuilder AppendLine(this StringBuilder sb, byte[] value, string prefixString, Encoding encoding)
+#else
+        public static StringBuilder AppendLine(this StringBuilder sb, byte[]? value, string prefixString, Encoding encoding)
+#endif
+        {
+            string valueString = (value == null ? "[NULL]" : encoding.GetString(value).Replace("\0", string.Empty));
+            return sb.AppendLine($"{prefixString}: {valueString}");
+        }
+
         /// <summary>
         /// Append a line containing a Int16[] value to a StringBuilder
         /// </summary>
diff --git a/BinaryObjectScanner.Printing/NewExecutable.cs b/BinaryObjectScanner.Printing/NewExecutable.cs
index b83f6ae8..f8979a1e 100644
--- a/BinaryObjectScanner.Printing/NewExecutable.cs
+++ b/BinaryObjectScanner.Printing/NewExecutable.cs
@@ -225,7 +225,7 @@ namespace BinaryObjectScanner.Printing
                     }
 #endif
                     builder.AppendLine(typeAndNameString.Value.Length, "    Length");
-                    builder.AppendLine($"    Text: {(typeAndNameString.Value.Text != null ? Encoding.ASCII.GetString(typeAndNameString.Value.Text).TrimEnd('\0') : "[EMPTY]")}");
+                    builder.AppendLine(typeAndNameString.Value.Text, "    Text", Encoding.ASCII);
                 }
             }
             builder.AppendLine();
@@ -257,7 +257,7 @@ namespace BinaryObjectScanner.Printing
                 }
 
                 builder.AppendLine(entry.Length, "    Length");
-                builder.AppendLine($"    Name string: {(entry.NameString != null ? Encoding.ASCII.GetString(entry.NameString).TrimEnd('\0') : "[EMPTY]")}");
+                builder.AppendLine(entry.NameString, "    Name string", Encoding.ASCII);
                 builder.AppendLine(entry.OrdinalNumber, "    Ordinal number");
             }
             builder.AppendLine();
@@ -324,7 +324,7 @@ namespace BinaryObjectScanner.Printing
                     }
 #endif
                 builder.AppendLine(entry.Value.Length, "    Length");
-                builder.AppendLine($"    Name string: {(entry.Value.NameString != null ? Encoding.ASCII.GetString(entry.Value.NameString) : "[EMPTY]")}");
+                builder.AppendLine(entry.Value.NameString, "    Name string", Encoding.ASCII);
             }
             builder.AppendLine();
         }
@@ -399,7 +399,7 @@ namespace BinaryObjectScanner.Printing
                 }
 
                 builder.AppendLine(entry.Length, "    Length");
-                builder.AppendLine($"    Name string: {(entry.NameString != null ? Encoding.ASCII.GetString(entry.NameString) : "[EMPTY]")}");
+                builder.AppendLine(entry.NameString, "    Name string", Encoding.ASCII);
                 builder.AppendLine(entry.OrdinalNumber, "    Ordinal number");
             }
             builder.AppendLine();