aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change conversion algorithm to behave correctly with multibyte

Browse Source 
encodings.
This commit is contained in:
Natalia Portillo
2017-06-06 21:38:30 +01:00
parent fb0a2898a0
commit e319b47d23
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
DiscImageChef.Helpers/StringHandlers.cs
View File

@@ -31,6 +31,7 @@
// ****************************************************************************/ // ****************************************************************************/
using System.Text; using System.Text;
using System;
namespace DiscImageChef namespace DiscImageChef
{ {
@@ -57,17 +58,20 @@ namespace DiscImageChef
if(CString == null) if(CString == null)
return null; return null;
StringBuilder sb = new StringBuilder(); int len = 0;
for(int i = 0; i < CString.Length; i++) for(int i = 0; i < CString.Length; i++)
{ {
if(CString[i] == 0) if(CString[i] == 0)
break; break;
sb.Append(encoding.GetString(CString, i, 1)); len++;
} }
return sb.ToString(); byte[] dest = new byte[len];
Array.Copy(CString, 0, dest, 0, len);
return len == 0 ? "" : encoding.GetString(dest);
} }
/// <summary> /// <summary>
@@ -91,16 +95,21 @@ namespace DiscImageChef
if(PascalString == null) if(PascalString == null)
return null; return null;
StringBuilder sb = new StringBuilder();
byte length = PascalString[0]; byte length = PascalString[0];
int len = 0;
for(int i = 1; i < length + 1; i++) for(int i = 1; i < length + 1 && i < PascalString.Length; i++)
{ {
sb.Append(encoding.GetString(PascalString, i, 1)); if(PascalString[i] == 0)
break;
len++;
} }
return sb.ToString(); byte[] dest = new byte[len];
Array.Copy(PascalString, 1, dest, 0, len);
return len == 0 ? "" : encoding.GetString(dest);
} }
/// <summary> /// <summary>
@@ -124,7 +133,7 @@ namespace DiscImageChef
if(SpacePaddedString == null) if(SpacePaddedString == null)
return null; return null;
int length = 0; int len = 0;
for(int i = SpacePaddedString.Length; i >= 0; i--) for(int i = SpacePaddedString.Length; i >= 0; i--)
{ {
@@ -133,12 +142,12 @@ namespace DiscImageChef
if(SpacePaddedString[i - 1] != 0x20) if(SpacePaddedString[i - 1] != 0x20)
{ {
length = i; len = i;
break; break;
} }
} }
return length == 0 ? "" : encoding.GetString(SpacePaddedString, 0, length); return len == 0 ? "" : encoding.GetString(SpacePaddedString, 0, len);
} }
/// <summary> /// <summary>
@@ -173,7 +182,6 @@ namespace DiscImageChef
return temp; return temp;
} }
} }
} }