Important Update:
- JSONparseCore: - Bug Fix: Always report "First entry must be Object" error
This commit is contained in:
@@ -352,26 +352,21 @@ bool CJSONparse::ReadFromBuffer( const char * BasePath )
|
||||
|
||||
// Parse Root Object
|
||||
SkipWhiteSpace();
|
||||
if (!ParseObject( BaseMember ) && !Error && !ParseArray( BaseMember )) {
|
||||
if (!Error) {
|
||||
if (!ParseObject( BaseMember ) && !Error && !ParseArray( BaseMember ) && !Error) {
|
||||
Error = true;
|
||||
CharNo += BufPos-Mark;
|
||||
sprintf( ErrorText, "First entry in file must be an Object or Array on line %d:%d", LineNo, CharNo );
|
||||
}
|
||||
FreeBuffer();
|
||||
if (Error) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Ensure remainder of file is empty
|
||||
SkipWhiteSpace();
|
||||
if (Error) {
|
||||
return false;
|
||||
}
|
||||
else if (*BufPos != 0) {
|
||||
if (*BufPos != 0) {
|
||||
Error = true;
|
||||
CharNo += BufPos-Mark;
|
||||
sprintf( ErrorText, "No content expected after Root object on line %d:%d", LineNo, CharNo );
|
||||
FreeBuffer();
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user