From 2eca6ec8be03bdb11ce61fc019783660dbf1fe72 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Tue, 26 Dec 2017 06:36:15 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9BCorrected=20miscalling=20current=20?= =?UTF-8?q?encoding=20when=20identifying=20filesystems.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DiscImageChef.Filesystems/AppleHFSPlus.cs | 2 +- DiscImageChef.Filesystems/ISO9660/Info.cs | 10 +++++----- DiscImageChef.Filesystems/SysV.cs | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/DiscImageChef.Filesystems/AppleHFSPlus.cs b/DiscImageChef.Filesystems/AppleHFSPlus.cs index 36725d8d..672fd81f 100644 --- a/DiscImageChef.Filesystems/AppleHFSPlus.cs +++ b/DiscImageChef.Filesystems/AppleHFSPlus.cs @@ -66,7 +66,6 @@ namespace DiscImageChef.Filesystems public virtual bool Identify(IMediaImage imagePlugin, Partition partition) { - currentEncoding = Encoding.BigEndianUnicode; if(2 + partition.Start >= partition.End) return false; ushort drSigWord; @@ -107,6 +106,7 @@ namespace DiscImageChef.Filesystems public virtual void GetInformation(IMediaImage imagePlugin, Partition partition, out string information, Encoding encoding) { + currentEncoding = Encoding.BigEndianUnicode; information = ""; ushort drSigWord; diff --git a/DiscImageChef.Filesystems/ISO9660/Info.cs b/DiscImageChef.Filesystems/ISO9660/Info.cs index aabe5fa3..cd36f1e5 100644 --- a/DiscImageChef.Filesystems/ISO9660/Info.cs +++ b/DiscImageChef.Filesystems/ISO9660/Info.cs @@ -69,12 +69,12 @@ namespace DiscImageChef.Filesystems.ISO9660 Array.Copy(vdSector, 0x001 + xaOff, vdMagic, 0, 5); Array.Copy(vdSector, 0x009 + xaOff, hsMagic, 0, 5); - DicConsole.DebugWriteLine("ISO9660 plugin", "VDMagic = {0}", currentEncoding.GetString(vdMagic)); - DicConsole.DebugWriteLine("ISO9660 plugin", "HSMagic = {0}", currentEncoding.GetString(hsMagic)); + DicConsole.DebugWriteLine("ISO9660 plugin", "VDMagic = {0}", Encoding.ASCII.GetString(vdMagic)); + DicConsole.DebugWriteLine("ISO9660 plugin", "HSMagic = {0}", Encoding.ASCII.GetString(hsMagic)); - return currentEncoding.GetString(vdMagic) == ISO_MAGIC || - currentEncoding.GetString(hsMagic) == HIGH_SIERRA_MAGIC || - currentEncoding.GetString(vdMagic) == CDI_MAGIC; + return Encoding.ASCII.GetString(vdMagic) == ISO_MAGIC || + Encoding.ASCII.GetString(hsMagic) == HIGH_SIERRA_MAGIC || + Encoding.ASCII.GetString(vdMagic) == CDI_MAGIC; } public virtual void GetInformation(IMediaImage imagePlugin, Partition partition, out string information, Encoding encoding) diff --git a/DiscImageChef.Filesystems/SysV.cs b/DiscImageChef.Filesystems/SysV.cs index 20c097b6..871f8e4e 100644 --- a/DiscImageChef.Filesystems/SysV.cs +++ b/DiscImageChef.Filesystems/SysV.cs @@ -116,9 +116,9 @@ namespace DiscImageChef.Filesystems byte[] coherent_string = new byte[6]; Array.Copy(sb_sector, 0x1E4, coherent_string, 0, 6); // Coherent UNIX s_fname location - string s_fname = StringHandlers.CToString(coherent_string, currentEncoding); + string s_fname = StringHandlers.CToString(coherent_string); Array.Copy(sb_sector, 0x1EA, coherent_string, 0, 6); // Coherent UNIX s_fpack location - string s_fpack = StringHandlers.CToString(coherent_string, currentEncoding); + string s_fpack = StringHandlers.CToString(coherent_string); if(s_fname == COH_FNAME && s_fpack == COH_FPACK || s_fname == COH_XXXXX && s_fpack == COH_XXXXX || s_fname == COH_XXXXS && s_fpack == COH_XXXXN) return true;