From f176776bd73a54e96aa83d9f2fefa4a919cea876 Mon Sep 17 00:00:00 2001 From: drh <> Date: Sat, 29 Apr 2023 00:59:22 +0000 Subject: [PATCH] Correctly recognize an isolated U+feff as a space character in JSON5. FossilOrigin-Name: 4473dc8e3ad18bb6185ed4a819baf881a7d26ac74bc70fae6ba23a0030be8316 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/json.c | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index e5775f3c07..5893cfd206 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Bug\sfixes\sin\sthe\slogic\sto\sskip\sover\sJSON5\scomments. -D 2023-04-28T23:38:54.056 +C Correctly\srecognize\san\sisolated\sU+feff\sas\sa\sspace\scharacter\sin\sJSON5. +D 2023-04-29T00:59:22.682 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -594,7 +594,7 @@ F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51 F src/hwtime.h b638809e083b601b618df877b2e89cb87c2a47a01f4def10be4c4ebb54664ac7 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71 F src/insert.c a8de1db43335fc4946370a7a7e47d89975ad678ddb15078a150e993ba2fb37d4 -F src/json.c 92a84ce1c933ef09296a0a9fdaea95c07d5548ef2f1e540197cfbdef9b38a60a +F src/json.c 3535ddb77b6bea2374a1ca5dad44cf616969bf202f8143c76bc9d1e38d1b587a F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa F src/loadext.c be5af440f3192c58681b5d43167dbca3ccbfce394d89faa22378a14264781136 F src/main.c 09bc5191f75dc48fc4dfddda143cb864c0c3dbc3297eb9a9c8e01fea58ff847d @@ -2067,8 +2067,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 8f7ab5d9210490eb451534df246b82081a5aa252a1bd662659df3da429290837 -R cb0f54422021b51368018226423f13cc +P c736b77a2fc5f8f2ba8f770adf05443dfdc3a9847ee519f411e661f76756d611 +R dbfd99e9ae655ae239188884ec879742 U drh -Z 7078eb5b44d703d85936a37156ec4b2c +Z 9ebd8716513a39a289a7550b0949e896 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 88b9340307..dc0a2012c6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c736b77a2fc5f8f2ba8f770adf05443dfdc3a9847ee519f411e661f76756d611 \ No newline at end of file +4473dc8e3ad18bb6185ed4a819baf881a7d26ac74bc70fae6ba23a0030be8316 \ No newline at end of file diff --git a/src/json.c b/src/json.c index f2856a841e..deeb107671 100644 --- a/src/json.c +++ b/src/json.c @@ -1492,7 +1492,8 @@ json_parse_restart: case 0xc2: case 0xe1: case 0xe2: - case 0xe3: { + case 0xe3: + case 0xef: { j = json5Whitespace(&z[i]); if( j>0 ){ i += j; -- 2.47.2