Bug fixes in the logic to skip over JSON5 comments.

FossilOrigin-Name: c736b77a2fc5f8f2ba8f770adf05443dfdc3a9847ee519f411e661f76756d611

diff --git a/manifest b/manifest
index 0d0cafc8eba06854d6860fc8e8c77ddd83e08a1a..e5775f3c0728c72a9acca9863172cc774ccdf1d6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Bug\sfix\sin\sthe\soffset\scomputation\sfor\sjson_error().
-D 2023-04-28T23:19:11.271
+C Bug\sfixes\sin\sthe\slogic\sto\sskip\sover\sJSON5\scomments.
+D 2023-04-28T23:38:54.056
 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 cc36f7df741f617624abc73adba6ffea1f3358196e1b78b43124265e941d332a
+F src/json.c 92a84ce1c933ef09296a0a9fdaea95c07d5548ef2f1e540197cfbdef9b38a60a
 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 8d09dc1c45a8026b94f70273d064e47939f30cadedc17548b5a26ba054a8d3a7
-R 85ded77d7e850b8c4e5d880f9f34a021
+P 8f7ab5d9210490eb451534df246b82081a5aa252a1bd662659df3da429290837
+R cb0f54422021b51368018226423f13cc
 U drh
-Z 6b839a1d682f3ab7c8bf4f474d197593
+Z 7078eb5b44d703d85936a37156ec4b2c
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 7bde04d486d4556a5cb089b63b2ca38d5bcdf5a8..88b9340307c66cabd7080212055966e9e03655b5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8f7ab5d9210490eb451534df246b82081a5aa252a1bd662659df3da429290837
\ No newline at end of file
+c736b77a2fc5f8f2ba8f770adf05443dfdc3a9847ee519f411e661f76756d611
\ No newline at end of file

diff --git a/src/json.c b/src/json.c
index 83b02bf5a4bd958417d1fab85af9566da73ab074..f2856a841ea8055cdc731b742cff52dfb1676633 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -963,12 +963,22 @@ static int json5Whitespace(const char *zIn){
           for(j=n+3; z[j]!='/' || z[j-1]!='*'; j++){
             if( z[j]==0 ) goto whitespace_done;
           }
-          n += j+1;
+          n = j+1;
           break;
         }else if( z[n+1]=='/' ){
           int j;
-          for(j=n+2; z[j] && z[j]!='\n'; j++){}
-          n += j;
+          char c;
+          for(j=n+2; (c = z[j])!=0; j++){
+            if( c=='\n' || c=='\r' ) break;
+            if( 0xe2==(u8)c && 0x80==(u8)z[j+1]
+             && (0xa8==(u8)z[j+2] || 0xa9==(u8)z[j+2])
+            ){
+              j += 2;
+              break;
+            }
+          }
+          n = j;
+          if( z[n] ) n++;
           break;
         }
         goto whitespace_done;