Changeset 74179 in vbox for trunk/src/VBox/Runtime/common/misc

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

File:

• trunk/src/VBox/Runtime/common/misc/json.cpp (modified) (3 diffs)

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);