Skip to content

Allow keys (names) to have non alpha numeric characters #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −2
Open

Allow keys (names) to have non alpha numeric characters #113

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/wjelement/search.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,19 @@ DebugAssert(0);
return(0);
}

/*
Determine if the provided character is valid in an unquoted JSON name.
This will mimic the functionality of isalnum(). But this will follow the
rules for JSON names, which can be found in RFC 7159. Section 4 states a
name must be a string. Section 7 gives the characters that can be used in a
name.
*/
static int is_json_ch(int c)
{
// unescaped = %x20-21 / %x23-5B / %x5D-10FFFF
return((c >= 0x20 && c <= 0x21) || (c >= 0x23 && c <= 0x5B) || (c >= 0x5D && c <= 0x10FFFF));
}

/*
Return the begining of the name of the next element in the path. Length
will be filled out, and end will be set to the first character that is not
Expand Down Expand Up @@ -678,14 +691,14 @@ DebugAssert(0);
p++;
}
}
} else if (isalnumx(*path)) {
} else if (is_json_ch(*path)) {
/*
alpha-numeric name

Find the first character that is not part of the alpha-numeric name
and verify that it is a valid terminator for this name.
*/
for (p = path + 1; isalnumx(*p); p++);
for (p = path + 1; is_json_ch(*p); p++);

if (len) *len = p - path;
if (!WJENextNameCheck(p, path, len, end)) {
Expand Down