icdsystems/ICD.Common.Utils
1
0
Fork 0
mirror of https://github.com/ICDSystems/ICD.Common.Utils.git synced 2026-04-14 04:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Potential fix for reading null IPIDs from configs

Browse source
This commit is contained in:
Chris Cameron 2017-11-20 17:18:31 -05:00
parent ec0f3ebc97
commit 55d2f437cc
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ICD.Common.Utils/StringUtils.cs
View file

@ -452,8 +452,17 @@ namespace ICD.Common.Utils
/// <returns></returns> /// <returns></returns>
public static byte FromIpIdString(string value) public static byte FromIpIdString(string value)
{ {
value = value.Replace("0x", ""); if (value == null)
return Convert.ToByte(value, 16); throw new ArgumentNullException("value");
try
{
return (byte)Convert.ToInt64(value, 16);
}
catch (ArgumentOutOfRangeException e)
{
throw new FormatException(e.Message, e);
}
} }
/// <summary> /// <summary>

2
ICD.Common.Utils/Xml/XmlReaderExtensions.cs
View file

@ -246,7 +246,7 @@ namespace ICD.Common.Utils.Xml
throw new ArgumentNullException("extends"); throw new ArgumentNullException("extends");
string content = extends.ReadElementContentAsString(); string content = extends.ReadElementContentAsString();
return (byte)Convert.ToInt64(content, 16); return StringUtils.FromIpIdString(content);
} }
/// <summary> /// <summary>