From 16562e78fb1ce05ecd4f19d99d4610d79f808234 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Tue, 12 Feb 2019 18:52:00 +0000
Subject: [PATCH] Fix trimming of null character and spaces in Joliet volume
 descriptor.

---
 DiscImageChef.Core/Sidecar/Sidecar.cs               |  4 ++--
 DiscImageChef.Filesystems/ISO9660/Structs/Joliet.cs | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/DiscImageChef.Core/Sidecar/Sidecar.cs b/DiscImageChef.Core/Sidecar/Sidecar.cs
index d63805fd1..2c4db69ea 100644
--- a/DiscImageChef.Core/Sidecar/Sidecar.cs
+++ b/DiscImageChef.Core/Sidecar/Sidecar.cs
@@ -64,7 +64,7 @@ namespace DiscImageChef.Core
 
             // For fast debugging, skip checksum
             //goto skipImageChecksum;
-
+/*
             byte[] data;
             long   position = 0;
             InitProgress();
@@ -90,7 +90,7 @@ namespace DiscImageChef.Core
             // For fast debugging, skip checksum
             //skipImageChecksum:
 
-            EndProgress();
+            EndProgress();*/
             fs.Close();
 
             List<ChecksumType> imgChecksums = imgChkWorker.End();
diff --git a/DiscImageChef.Filesystems/ISO9660/Structs/Joliet.cs b/DiscImageChef.Filesystems/ISO9660/Structs/Joliet.cs
index 3b6de049f..624847691 100644
--- a/DiscImageChef.Filesystems/ISO9660/Structs/Joliet.cs
+++ b/DiscImageChef.Filesystems/ISO9660/Structs/Joliet.cs
@@ -41,16 +41,16 @@ namespace DiscImageChef.Filesystems.ISO9660
         {
             DecodedVolumeDescriptor decodedVD = new DecodedVolumeDescriptor
             {
-                SystemIdentifier = Encoding.BigEndianUnicode.GetString(jolietvd.system_id).TrimEnd().Trim('\u0000'),
-                VolumeIdentifier = Encoding.BigEndianUnicode.GetString(jolietvd.volume_id).TrimEnd().Trim('\u0000'),
+                SystemIdentifier = Encoding.BigEndianUnicode.GetString(jolietvd.system_id).Replace('\u0000', ' ').TrimEnd(),
+                VolumeIdentifier = Encoding.BigEndianUnicode.GetString(jolietvd.volume_id).Replace('\u0000', ' ').TrimEnd(),
                 VolumeSetIdentifier =
-                    Encoding.BigEndianUnicode.GetString(jolietvd.volume_set_id).TrimEnd().Trim('\u0000'),
+                    Encoding.BigEndianUnicode.GetString(jolietvd.volume_set_id).Replace('\u0000', ' ').TrimEnd(),
                 PublisherIdentifier =
-                    Encoding.BigEndianUnicode.GetString(jolietvd.publisher_id).TrimEnd().Trim('\u0000'),
+                    Encoding.BigEndianUnicode.GetString(jolietvd.publisher_id).Replace('\u0000', ' ').TrimEnd(),
                 DataPreparerIdentifier =
-                    Encoding.BigEndianUnicode.GetString(jolietvd.preparer_id).TrimEnd().Trim('\u0000'),
+                    Encoding.BigEndianUnicode.GetString(jolietvd.preparer_id).Replace('\u0000', ' ').TrimEnd(),
                 ApplicationIdentifier =
-                    Encoding.BigEndianUnicode.GetString(jolietvd.application_id).TrimEnd().Trim('\u0000')
+                    Encoding.BigEndianUnicode.GetString(jolietvd.application_id).Replace('\u0000', ' ').TrimEnd()
             };
 
             if(jolietvd.creation_date[0] < 0x31 || jolietvd.creation_date[0] > 0x39)