More ALWAYS() macros.

FossilOrigin-Name: 770b09f7a795956be63a06847059370db8dfc88654878d742b7b826947029962

diff --git a/manifest b/manifest
index f13e0d02403b517c14803d26c4d0a162e5dbed04..2bc4528324dddc1c48600a03326687fcaf3ec250 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sALWAYS\smacros\son\sunreachable\sbranches\sin\sthe\snew\sJSON5\slogic.
-D 2023-04-29T17:13:39.696
+C More\sALWAYS()\smacros.
+D 2023-04-29T17:35:29.727
 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 0de525ac85b275cfbe6a7eb565c9c7849f884331153f60024715a47a18ed781e
+F src/json.c f76772b2d780f9711896e10bb6efa32d839d9c3fef225d3476e6f5b6683a04f3
 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 01ee613c07fcb87e7d7b7f1b1387982715d1343418f37f4a1dc90e43a76d20e8
-R 8691ebe0c22e2def3817b9ef68bc683b
+P 91e15ed9d93e51b750172a074dbbcf206128e9476571ce6189b8ea0ba5ab4135
+R b78f203ca73d8ea097a8cd3d3031aec7
 U drh
-Z 4bc62005656847ff8857de80fff89c9b
+Z 43d50e401ed22df6c70dd6bacd839b80
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 8139537284e36c59d7e1a7b29bb787586df16168..6cdf339ed23cbd72cd9373a98ac4b919ddf44519 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-91e15ed9d93e51b750172a074dbbcf206128e9476571ce6189b8ea0ba5ab4135
\ No newline at end of file
+770b09f7a795956be63a06847059370db8dfc88654878d742b7b826947029962
\ No newline at end of file

diff --git a/src/json.c b/src/json.c
index 7876bdcbc47cec525119b00da674a87e1f1e6695..a78aa8e614c7ccfab2a225355e2b64e8042e9781 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -1393,7 +1393,7 @@ json_parse_restart:
       }
       if( c=='e' || c=='E' ){
         if( z[j-1]<'0' ){
-          if( ALWAYS(z[j-1]=='.') && j-2>=i && sqlite3Isdigit(z[j-2]) ){
+          if( ALWAYS(z[j-1]=='.') && ALWAYS(j-2>=i) && sqlite3Isdigit(z[j-2]) ){
             pParse->has5 = 1;
             jnFlags |= JNODE_JSON5;
           }else{
@@ -1421,7 +1421,7 @@ json_parse_restart:
       break;
     }
     if( z[j-1]<'0' ){
-      if( ALWAYS(z[j-1]=='.') && j-2>=i && sqlite3Isdigit(z[j-2]) ){
+      if( ALWAYS(z[j-1]=='.') && ALWAYS(j-2>=i) && sqlite3Isdigit(z[j-2]) ){
         pParse->has5 = 1;
         jnFlags |= JNODE_JSON5;
       }else{