sigonasr2/SMX_PGE
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix exception parsing empty JSON arrays.

Browse Source
This commit is contained in:
Glenn Maynard 2019-09-14 21:17:18 -05:00
parent 63f7aa5beb
commit 80b08dbe0c
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
smx-config/SMXJSON.cs
View File

@ -360,22 +360,25 @@ namespace SMXJSON
List<Object> result = new List<Object>(); List<Object> result = new List<Object>();
while(true) while(true)
{ {
SkipWhitespace(reader);
if(reader.Peek() == ']')
{
reader.Read();
return result;
}
if(result.Count > 0)
{
int comma = reader.Read();
if(comma == -1)
throw new ParseError(reader, "Unexpected EOF reading array");
if(comma != ',')
throw new ParseError(reader, "Expected ',', got " + comma + " reading array");
SkipWhitespace(reader);
}
Object value = ParseJSONValue(reader); Object value = ParseJSONValue(reader);
result.Add(value); result.Add(value);
SkipWhitespace(reader);
int nextCharacter = reader.Read();
switch(nextCharacter)
{
case ']':
return result;
case ',':
continue;
case -1:
throw new ParseError(reader, "Unexpected EOF reading array");
default:
throw new ParseError(reader, "Unexpected token " + nextCharacter + " reading array");
}
} }
} }
static private Dictionary<string, Object> ReadJSONDictionary(StringReader reader) static private Dictionary<string, Object> ReadJSONDictionary(StringReader reader)