Skip to content

Fixed literal string parsing to allow unescaped quote character #155

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

Draft
dpev wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fixed literal string parsing to allow unescaped quote character #155

Show file tree
Hide file tree
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
8 changes: 7 additions & 1 deletion Source/udJSON.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -968,7 +968,13 @@ udResult udJSON::Parse(const char *pString, int *pCharCount, int *pLineNumber)
}
else if (*pString == '\"' || *pString == '\'') // Allow single quotes
{
size_t endPos = udStrMatchBrace(pString, '\\');
size_t endPos;
if (pCharCount)
endPos = udStrMatchBrace(pString, '\\');
else
endPos = udStrlen(pString);
while (pString[endPos - 1] == ' ' || pString[endPos - 1] == '\t')
--endPos;
// Force a parse error if the string isn't quoted properly
UD_ERROR_IF(pString[endPos - 1] != pString[0], udR_ParseError);
char *pStr = udAllocType(char, endPos, udAF_None);
Expand Down
8 changes: 8 additions & 0 deletions udTest/src/udJSONTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,14 @@ TEST(udJSONTests, CreationSimple)
g_udBreakOnError = false;
EXPECT_NE(udR_Success, v.Set("Settings.Something"));
g_udBreakOnError = true;

EXPECT_EQ(udR_Success, v.Set("Settings.MyString1 = 'has ' quote'")); // Literals accept quote character mid-string as a special case
EXPECT_EQ(udR_Success, v.Set("Settings.MyString2 = 'has \\' quote'")); // Quote character escaped
EXPECT_EQ(0, udStrcmp(v.Get("Settings.MyString1").AsString(), v.Get("Settings.MyString2").AsString()));
EXPECT_EQ(udR_Success, v.Set("Settings.MyString3 = \"has \\\" quote\" ")); // Test with double-quote character and trailing spaces
EXPECT_EQ(udR_Success, v.Set("Settings.MyString4 = 'has \" quote' ")); // Test with double-quote character and trailing spaces
EXPECT_EQ(0, udStrcmp(v.Get("Settings.MyString3").AsString(), v.Get("Settings.MyString4").AsString()));

EXPECT_EQ(udR_Success, v.Set("Settings.EmptyArray = []"));
EXPECT_EQ(udR_Success, v.Set("Settings.Nothing = null"));
// Of note here is that the input string is currently JSON escaped, so there's some additional backslashes
Expand Down