Do not allow digit separators that are not surrounded on both sides by digits.

FossilOrigin-Name: 5bbc378a3022e2013048c8e296d95de21d15a8d7c1b62e8ffb64782f952cfe12

diff --git a/manifest b/manifest
index d5565a35b72059951e5a391402548dfa931461c0..b43db80a8cd01b4d9595d5449aea45c18ac909d2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\stest\sscript\sliteral.test\sso\sthat\sit\sworks\swith\sSQLITE_OMIT_ALTER_TABLE\sbuilds.
-D 2024-01-22T11:12:38.218
+C Do\snot\sallow\sdigit\sseparators\sthat\sare\snot\ssurrounded\son\sboth\ssides\sby\sdigits.
+D 2024-01-22T17:18:41.963
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -800,7 +800,7 @@ F src/test_windirent.h da2e5b73c32d09905fbdd00f27cd802212a32a58ead882736fe4f5eb7
 F src/test_window.c cdae419fdcea5bad6dcd9368c685abdad6deb59e9fc8b84b153de513d394ba3f
 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
-F src/tokenize.c e0cdd971ebf7225cd617661d8198fc90a49559e21210af03bdf440e2fcba6b88
+F src/tokenize.c 1664cd0d9224bf63e7471d892074f580933c0e85a3b77f98e016dce2d5fed4a5
 F src/treeview.c c6fc972683fd00f975d8b32a81c1f25d2fb7d4035366bf45c9f5622d3ccd70ee
 F src/trigger.c 0905b96b04bb6658509f711a8207287f1315cdbc3df1a1b13ba6483c8e341c81
 F src/update.c 6904814dd62a7a93bbb86d9f1419c7f134a9119582645854ab02b36b676d9f92
@@ -2159,8 +2159,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 03ade4a810516ff84bc5c1a716b0e454cc8a89374100415ff21a82449112811b
-R 4dc96dbb63712d691b87fb65e2e995c9
-U dan
-Z 060bde75456debf514e23a793c3f90b5
+P b57327be4be9638f5ee834a6c9e06135aaef9e499516f8b53f927ffe81033f61
+R dc78fe3596a95d4e421310d3dc095c60
+U drh
+Z 8ae254187429ecb3341b495c0d5f92df
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 902662ca4b3df8c5ac6f33cb54101e017641d1fe..40427080bfc8f4fa0bbc7e4effef3f3d34c60a8e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b57327be4be9638f5ee834a6c9e06135aaef9e499516f8b53f927ffe81033f61
\ No newline at end of file
+5bbc378a3022e2013048c8e296d95de21d15a8d7c1b62e8ffb64782f952cfe12
\ No newline at end of file

diff --git a/src/tokenize.c b/src/tokenize.c
index 592d6b8d8d1987c404ca5b93f17c397d6ae0e754..37254da70df6c8ae322cae8814f0f5c2b2f6137e 100644 (file)
--- a/src/tokenize.c
+++ b/src/tokenize.c
@@ -443,8 +443,14 @@ int sqlite3GetToken(const unsigned char *z, int *tokenType){
 #endif
       for(i=0; 1; i++){
         if( sqlite3Isdigit(z[i])==0 ){
-          if( z[i]==SQLITE_DIGIT_SEPARATOR ){ *tokenType = TK_QNUMBER; }
-          else{ break; }
+          if( z[i]==SQLITE_DIGIT_SEPARATOR
+           && sqlite3Isdigit(z[i-1])
+           && sqlite3Isdigit(z[i+1])
+          ){
+            *tokenType = TK_QNUMBER;
+          }else{
+            break;
+          }
         }
       }
 #ifndef SQLITE_OMIT_FLOATING_POINT
@@ -452,8 +458,14 @@ int sqlite3GetToken(const unsigned char *z, int *tokenType){
         if( *tokenType==TK_INTEGER ) *tokenType = TK_FLOAT;
         for(i++; 1; i++){
           if( sqlite3Isdigit(z[i])==0 ){
-            if( z[i]==SQLITE_DIGIT_SEPARATOR ){ *tokenType = TK_QNUMBER; }
-            else{ break; }
+            if( z[i]==SQLITE_DIGIT_SEPARATOR
+             && sqlite3Isdigit(z[i-1])
+             && sqlite3Isdigit(z[i+1])
+            ){
+              *tokenType = TK_QNUMBER;
+            }else{
+              break;
+            }
           }
         }
       }