database/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2026-10-23 21:28:56 +03:00
Code Activity

Accept hex digits in JSON \u escapes when skipping.

Browse Source 
jsonReadSkipStr() required four decimal digits after \u, so a valid escape with hex digits such as \u003c failed validation even though jsonReadStr() decodes it. Accept hex digits so skipping agrees with reading.

pgBackRest does not write \u escapes, so this only affects JSON from other sources. jsonReadStr() still decodes only \u00XX, as a single byte.
This commit is contained in:
David Steele
2026-10-12 10:31:13 +02:00
parent 1808295ccd
commit b63357ee89
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/type/json.c
View File

@@ -836,12 +836,12 @@ jsonReadSkipStr(JsonRead *const this)
{
this->json++;
// Expect four digits
// Expect four hex digits
unsigned int digitIdx = 0;
for (; digitIdx < 4; digitIdx++)
{
if (!isdigit(this->json[digitIdx]))
if (!isxdigit((unsigned char)this->json[digitIdx]))
break;
}

1
test/src/module/common/type/jsonTest.c
View File

@@ -245,6 +245,7 @@ testRun(void)
TEST_RESULT_VOID(jsonValidate(json), "valid");
TEST_RESULT_VOID(jsonValidate(STRDEF("[\"\\u0041\",\"\\u1234\"]")), "valid escapes before end of string");
TEST_RESULT_VOID(jsonValidate(STRDEF("[\"\\u003c\",\"\\uFFFF\"]")), "valid hex escapes");
TEST_ERROR(jsonValidate(STRDEF("\"\\u0041")), JsonFormatError, "expected '\"' but found null delimiter");
TEST_ERROR(jsonValidate(STRDEF("\"\\u000")), JsonFormatError, "unable to decode at: \\u000");
TEST_ERROR(jsonValidate(STRDEF("\"")), JsonFormatError, "expected '\"' but found null delimiter");