Fix harmless compiler warning in the CLI.

[forum:/forumpost/ffdcdaba19|Forum post ffdcdaba19].

FossilOrigin-Name: 1626b6082d06c6fd66ff0a6d9fb3641c936ee8db326275e4fddfecf172c5a6eb

diff --git a/manifest b/manifest
index 790a0fe783a04100ac526686d746af4c5a0346be..50c9aa91627978be35c45fda7328018605066834 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improve\sthe\squote-stripping\swhen\simporting\sa\sdb\sinto\sfiddle,\sas\sreported\sin\s[forum:264050a3f3\s|\sforum\spost\s264050a3f3].
-D 2025-09-17T20:05:12.597
+C Fix\sharmless\scompiler\swarning\sin\sthe\sCLI.\n[forum:/forumpost/ffdcdaba19|Forum\spost\sffdcdaba19].
+D 2025-09-18T16:48:37.721
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -743,7 +743,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c f8d1d011aba0964ff1bdccd049d4d2c2fec217efd90d202a4bb775e926b2c25d
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c b95181711d59c36d9789e67f76c4cfec64b99f9629a50be5e6566e117b87d957
-F src/shell.c.in 458c1a24d19251db547770fac50ae9c94dca42c310f8ecc937e3c587cd76ac8d
+F src/shell.c.in f27a115c1748f7f895ade31b3ff43d74ab89537ceb234ca4465708aedb47f1ea
 F src/sqlite.h.in 5732519a2acb09066032ceac21f25996eb3f28f807a4468e30633c7c70faae1c
 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
 F src/sqlite3ext.h 3f0c4ed6934e7309a61c6f3c30f70a30a5b869f785bb3d9f721a36c5e4359126
@@ -2175,8 +2175,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 9abaa0ac2b3049341f36ff683ff6eebb589698bd910624aa24f11398d557b3c2
-R 2e9c6e31ed45fdb3f25a4abad6195bd9
-U stephan
-Z 47d7a42ee3111d975aa9b48d64fb9880
+P 1a87c16fddf174380deba9bbe58079328baf9f9ca95210f63bc628e3ef3eeb26
+R 11c5a53507cc518db8aae6d2dca3c37b
+U drh
+Z caba9c5c36641af983c591b22bee0974
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 94cf596f33f88274c1634659547e55be62cb4054..6213a4381fb93079416253fbedcbaa0d4c9e082c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1a87c16fddf174380deba9bbe58079328baf9f9ca95210f63bc628e3ef3eeb26
+1626b6082d06c6fd66ff0a6d9fb3641c936ee8db326275e4fddfecf172c5a6eb

diff --git a/src/shell.c.in b/src/shell.c.in
index 08bc810f0a52086cbed70d0eac36e705369db8f7..1a658ef36deb36dcbaa7d140ac3f9d42f5c3bbfe 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -838,14 +838,24 @@ static int isVt100(const unsigned char *z){
 ** Take into account zero-width and double-width Unicode characters.
 ** In other words, a zero-width character does not count toward the
 ** the w limit.  A double-width character counts as two.
+**
+** w should normally be a small number.  A couple hundred at most.  This
+** routine caps w at 100 million to avoid integer overflow issues.
 */
 static void utf8_width_print(FILE *out, int w, const char *zUtf){
   const unsigned char *a = (const unsigned char*)zUtf;
+  static const int mxW = 10000000;
   unsigned char c;
   int i = 0;
   int n = 0;
   int k;
-  int aw = w<0 ? -w : w;
+  int aw;
+  if( w<-mxW ){
+    w = -mxW;
+  }else if( w>mxW ){
+    w= mxW;
+  }
+  aw = w<0 ? -w : w;
   if( zUtf==0 ) zUtf = "";
   while( (c = a[i])!=0 ){
     if( (c&0xc0)==0xc0 ){