Skip to content
This repository has been archived by the owner on Dec 7, 2023. It is now read-only.

Unify encoding to be Strict UTF8 #639

Merged
merged 2 commits into from
Aug 5, 2020
Merged

Unify encoding to be Strict UTF8 #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a51e2a5
Strict UTF8
shargon Aug 4, 2020
de25e16
Clean usings
shargon Aug 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 4 additions & 5 deletions neo-cli/CLI/MainService.Tools.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Numerics;
using System.Text;

namespace Neo.CLI
{
Expand Down Expand Up @@ -70,7 +69,7 @@ private string HexToString(string hexString)
{
var clearHexString = ClearHexString(hexString);
var bytes = clearHexString.HexToBytes();
var utf8String = Encoding.UTF8.GetString(bytes);
var utf8String = Utility.StrictUTF8.GetString(bytes);

if (!IsPrintable(utf8String))
{
Expand Down Expand Up @@ -170,7 +169,7 @@ private string StringToHex(string strParam)
{
try
{
var bytesParam = Encoding.UTF8.GetBytes(strParam);
var bytesParam = Utility.StrictUTF8.GetBytes(strParam);
return bytesParam.ToHexString();
}
catch
Expand All @@ -196,7 +195,7 @@ private string StringToBase64(string strParam)
{
try
{
byte[] bytearray = Encoding.UTF8.GetBytes(strParam);
byte[] bytearray = Utility.StrictUTF8.GetBytes(strParam);
string base64 = Convert.ToBase64String(bytearray.AsSpan());
return base64;
}
Expand Down Expand Up @@ -407,7 +406,7 @@ private string Base64ToString(string bytearray)
try
{
byte[] result = Convert.FromBase64String(bytearray);
string utf8string = Encoding.UTF8.GetString(result);
string utf8string = Utility.StrictUTF8.GetString(result);

if (!IsPrintable(utf8string))
{
Expand Down
3 changes: 1 addition & 2 deletions neo-cli/CLI/MainService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
using System.Linq;
using System.Net;
using System.Reflection;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;

Expand Down Expand Up @@ -263,7 +262,7 @@ private byte[] LoadDeploymentScript(string nefFilePath, string manifestFilePath,
}

NefFile file;
using (var stream = new BinaryReader(File.OpenRead(nefFilePath), Encoding.UTF8, false))
using (var stream = new BinaryReader(File.OpenRead(nefFilePath), Utility.StrictUTF8, false))
{
file = stream.ReadSerializable<NefFile>();
}
Expand Down