doylet/Dqn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix DqnJson bug matching property too early

Browse Source
This commit is contained in:
Doyle T 2018-07-05 12:20:19 +10:00
parent 9ebb4f8f23
commit 6fc26c7bb8
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dqn.h
View File

@ -6347,8 +6347,9 @@ DQN_FILE_SCOPE i64 Dqn_BSearch(i64 *array, i64 size, i64 find,
DQN_FILE_SCOPE DqnJson DqnJson_Get(char const *buf, i32 bufLen, char const *findProperty, i32 findPropertyLen) DQN_FILE_SCOPE DqnJson DqnJson_Get(char const *buf, i32 bufLen, char const *findProperty, i32 findPropertyLen)
{ {
DqnJson result = {}; DqnJson result = {};
char *locate = DqnStr_GetFirstOccurence(buf, bufLen, findProperty, findPropertyLen);
TryNext:
char *locate = DqnStr_GetFirstOccurence(buf, bufLen, findProperty, findPropertyLen);
if (!locate) return result; if (!locate) return result;
// NOTE: if find property is '{' we are looking for an object in array or the global scope etc // NOTE: if find property is '{' we are looking for an object in array or the global scope etc
@ -6362,7 +6363,11 @@ DQN_FILE_SCOPE DqnJson DqnJson_Get(char const *buf, i32 bufLen, char const *find
if (!(findProperty[0] == '"' && findProperty[findPropertyLen - 1] == '"')) if (!(findProperty[0] == '"' && findProperty[findPropertyLen - 1] == '"'))
{ {
if (locate[-1] != '"' || locate[findPropertyLen] != '"') if (locate[-1] != '"' || locate[findPropertyLen] != '"')
return result; {
bufLen -= ((locate - buf) + findPropertyLen);
buf = locate + findPropertyLen;
goto TryNext;
}
} }
if (!(locate[findPropertyLen + 1] && locate[findPropertyLen + 1] == ':')) if (!(locate[findPropertyLen + 1] && locate[findPropertyLen + 1] == ':'))