Changeset 74179 in vbox for trunk/src

Timestamp:

Sep 10, 2018 10:46:31 AM (6 years ago)

Author:

vboxsync

Message:

IPRT/json: Added \uXXXX and surrogate pair tests. Refuse to decode U+0000, U+FFFE and U+FFFF. bugref:9167

Location:

trunk/src/VBox/Runtime

Files:

• common/misc/json.cpp (modified) (3 diffs)
• testcase/tstRTCRest-1.cpp (modified) (1 diff)
• testcase/tstRTJson.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/misc/json.cpp

@@ -695 +695 @@
                                     {
                                         /* The must be a low surrogate pair following the high one: */
+                                        rc = VINF_SUCCESS;
                                         ch = rtJsonTokenizerGetCh(pTokenizer);
                                         if (ch == '\\')
@@ -741 +742 @@
                                     if (RT_SUCCESS(rc))
                                     {
-                                        Assert(cchStr + RTStrCpSize(uc) < cchStrMax);
-                                        char *pszNext = RTStrPutCp(&pszDecoded[cchStr], uc);
-                                        Assert((size_t)(pszNext - &pszDecoded[cchStr]) == RTStrCpSize(uc));
-                                        cchStr += pszNext - &pszDecoded[cchStr];
-                                        break;
+                                        if (   uc != 0
+                                            && uc != 0xfffe
+                                            && uc != 0xffff)
+                                        {
+                                            Assert(cchStr + RTStrCpSize(uc) < cchStrMax);
+                                            char *pszNext = RTStrPutCp(&pszDecoded[cchStr], uc);
+                                            Assert((size_t)(pszNext - &pszDecoded[cchStr]) == RTStrCpSize(uc));
+                                            cchStr += pszNext - &pszDecoded[cchStr];
+                                            break;
+                                        }
+                                        rc = RTErrInfoSetF(pTokenizer->pErrInfo, VERR_JSON_INVALID_CODEPOINT,
+                                                           "Invalid \\u code point: %#x (line %zu col %zu)",
+                                                           uc, pTokenizer->Pos.iLine, pTokenizer->Pos.iChStart);
                                     }
                                 }
@@ -758 +767 @@
                         rc = RTErrInfoSetF(pTokenizer->pErrInfo, rc, "Missing UTF-16 surrogate pair (line %zu col %zu)",
                                            pTokenizer->Pos.iLine, pTokenizer->Pos.iChStart);
-                    else
+                    else if (rc == VERR_JSON_BAD_SURROGATE_PAIR_SEQUENCE)
                         rc = RTErrInfoSetF(pTokenizer->pErrInfo, rc, "Invalid UTF-16 surrogate pair (line %zu col %zu)",
                                            pTokenizer->Pos.iLine, pTokenizer->Pos.iChStart);

trunk/src/VBox/Runtime/testcase/tstRTCRest-1.cpp

@@ -1118 +1118 @@
         RTTESTI_CHECK(obj4.isNull() == false);
 
+        obj4.setNull();
+        RTTESTI_CHECK_RC(deserializeFromJson(&obj4, "\"42:\\uD801\\udC37\\ud852\\uDf62:42\"",  /* U+10437 U+24B62 */
+                                             &ErrInfo, RT_XSTR(__LINE__)), VINF_SUCCESS);
+        RTTESTI_CHECK(obj4 == "42:" "\xf0\x90\x90\xb7" "\xf0\xa4\xad\xa2" ":42");
+        RTTESTI_CHECK(obj4.isNull() == false);
+
         /* object goes to default state on failure: */
         obj4 = "asdf";

trunk/src/VBox/Runtime/testcase/tstRTJson.cpp

@@ -81 +81 @@
         { "{\"positive\":20}", VINF_SUCCESS },
         { "{\"negative\":-20}", VINF_SUCCESS },
+        { "\"\\u0001\"", VINF_SUCCESS },
+        { "\"\\u000\"", VERR_JSON_INVALID_UTF16_ESCAPE_SEQUENCE },
+        { "\"\\u00\"", VERR_JSON_INVALID_UTF16_ESCAPE_SEQUENCE },
+        { "\"\\u0\"", VERR_JSON_INVALID_UTF16_ESCAPE_SEQUENCE },
+        { "\"\\u\"", VERR_JSON_INVALID_UTF16_ESCAPE_SEQUENCE },
+        { "\"\\uGhKl\"", VERR_JSON_INVALID_UTF16_ESCAPE_SEQUENCE },
+        { "\"\\u0000z\"", VERR_JSON_INVALID_CODEPOINT },
+        { "\"\\uffff\"", VERR_JSON_INVALID_CODEPOINT },
+        { "\"\\ufffe\"", VERR_JSON_INVALID_CODEPOINT },
+        { "\"\\ufffd\"", VINF_SUCCESS},
+        { "\"\\ufffd1\"", VINF_SUCCESS},
+        { "\"\\ufffd12\"", VINF_SUCCESS},
+        { "\"\\uD801\\udC37\\ud852\\uDf62\"", VINF_SUCCESS },  /* U+10437 U+24B62 */
+        { "\"\\uD801 \\udC37\"", VERR_JSON_MISSING_SURROGATE_PAIR },
+        { "\"\\uD801udC37\"", VERR_JSON_MISSING_SURROGATE_PAIR },
+        { "\"\\uD801\"", VERR_JSON_MISSING_SURROGATE_PAIR },
+        { "\"\\uD801\\\"", VERR_JSON_MISSING_SURROGATE_PAIR },
+        { "\"\\uD801\\u\"", VERR_JSON_INVALID_UTF16_ESCAPE_SEQUENCE },
+        { "\"\\uD801\\ud\"", VERR_JSON_INVALID_UTF16_ESCAPE_SEQUENCE },
+        { "\"\\uD801\\udc\"", VERR_JSON_INVALID_UTF16_ESCAPE_SEQUENCE },
+        { "\"\\uD801\\udc3\"", VERR_JSON_INVALID_UTF16_ESCAPE_SEQUENCE },
+        { "\"\\uD801\\uDc37\"", VINF_SUCCESS},
+        { "\"\\uDbff\\uDfff\"", VINF_SUCCESS},
     };
     for (unsigned iTest = 0; iTest < RT_ELEMENTS(aTests); iTest++)