In the CLI, during error processing while looking for a word boundary,

avoid being deceived by malformed input that has a very long sequence
of 0x80 characters.
[forum:/forumpost/ab93a23ba1|forum post ab93a23ba1].

FossilOrigin-Name: 82609d5a2d4eba741d48ea265f4e749578964961903c072c7b222ffe2aefaa3c

diff --git a/manifest b/manifest
index c94b14ec3c5bc93ae77578a5fea7c82ff77c54a9..f963e7612ce6c8eb760d17b3bda0cc75a3fdcb13 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sthe\szipfile\sextension,\sdefend\sagainst\scorrupt\sZIP\sfiles\sthat\scontain\na\szero-length\sfilename.\n[forum:/forumpost/b15f5e3ad8|Forum\spost\sb15f5e3ad8].
-D 2023-04-06T00:59:41.126
+C In\sthe\sCLI,\sduring\serror\sprocessing\swhile\slooking\sfor\sa\sword\sboundary,\navoid\sbeing\sdeceived\sby\smalformed\sinput\sthat\shas\sa\svery\slong\ssequence\nof\s0x80\scharacters.\n[forum:/forumpost/ab93a23ba1|forum\spost\sab93a23ba1].
+D 2023-04-06T01:05:52.467
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -626,7 +626,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 3e53e02ce87c9582bd7e7d22f13f4094a271678d9dc72820fa257a2abb5e4032
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c df007d60326a9aad94f5a4915d01e7de19d77627ed09338747a2e8e741a75add
-F src/shell.c.in ca7161bd3d0c54b7b4dc02651fd2454b05e0ecdb5ba076a61215cd8bb0c767e8
+F src/shell.c.in 2140c98b8185ce5f024d706a552dd0ee861c35621dab6599a9234019348bf9dc
 F src/sqlite.h.in 84f0e61a07292977c31f108776e5148eb1c761e7c276de2290c1511dad7c7d3a
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
@@ -2052,8 +2052,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 1cd993c45cd6b60e00d1426dd01d63efad13f7258636b5fa694f21499e77955a
-R 83db8d662a6f7a0bae20734c688d29bc
+P 46db2e42a5f9b18da9661ccedca68cb70257ea5c58b33b401db2a5e030c1346a
+R 3627c9efb7548c46bc3a47ca70e854b9
 U drh
-Z d955adab3dd7b2a13ea222fedf06115c
+Z 9baf3dd4e699627dd6a76c9e074307b5
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index adf997132517e407fb49e00f23e58b27628d8fad..131ccf78b342a8a576ac0fdab6c8edd7c20b5ce4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-46db2e42a5f9b18da9661ccedca68cb70257ea5c58b33b401db2a5e030c1346a
\ No newline at end of file
+82609d5a2d4eba741d48ea265f4e749578964961903c072c7b222ffe2aefaa3c
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index a0fb1ac33fe4f9dde101134642c29295d6e0f7b2..67f7ba30b0946774bb39cf7ad959451e1a51303a 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -2786,7 +2786,7 @@ static char *shell_error_context(const char *zSql, sqlite3 *db){
   len = strlen(zSql);
   if( len>78 ){
     len = 78;
-    while( (zSql[len]&0xc0)==0x80 ) len--;
+    while( len>0 && (zSql[len]&0xc0)==0x80 ) len--;
   }
   zCode = sqlite3_mprintf("%.*s", len, zSql);
   shell_check_oom(zCode);