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

fix: Potential JSON under-read fix

Browse Source
This commit is contained in:
Chris Cameron
2019-08-07 17:34:07 -04:00
parent 02e6fe9f8c
commit ff6f15d3ef
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ICD.Common.Utils/Extensions/JsonSerializerExtensions.cs
View File

@@ -155,9 +155,14 @@ namespace ICD.Common.Utils.Extensions
while (reader.TokenType != JsonToken.EndObject) while (reader.TokenType != JsonToken.EndObject)
{ {
if (reader.TokenType != JsonToken.PropertyName) if (reader.TokenType != JsonToken.PropertyName)
throw new FormatException(); throw new FormatException(string.Format("Expected token {0} got {1}", JsonToken.PropertyName, reader.TokenType));
switch ((string)reader.Value) string propertyName = (string)reader.Value;
// Step into the value
reader.Read();
switch (propertyName)
{ {
case PROPERTY_KEY: case PROPERTY_KEY:
key = readKey(extends, reader); key = readKey(extends, reader);