From: dan <Dan Kennedy>
Date: Thu, 25 Sep 2025 10:50:11 +0000 (+0000)
Subject: Avoid an integer overflow ([forum:/forumpost/b3abe06121 | forum post b3abe06121]... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4d488bd341dd23990db19554ab96b7df28ffc1bc;p=thirdparty%2Fsqlite.git

Avoid an integer overflow ([forum:/forumpost/b3abe06121 | forum post b3abe06121]) and a compiler warning ([forum:/forumpost/3db6aa9ed6 | forum post 3db6aa9ed6]) in the shell tool code.

FossilOrigin-Name: 39925489b347ec3126389c6dba1ee719373e50c6cea6944384a212c3a3e163d2
---

diff --git a/manifest b/manifest
index 0a55401548..967896e48d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\smakefile\sso\sthat\s"<tt>test/testrunner.tcl\srelease\s--buildonly</tt>"\nworks\son\smac.\s\sApparently\sbroken\sby\s[b7751d144330593b].
-D 2025-09-24T20:44:33.762
+C Avoid\san\sinteger\soverflow\s([forum:/forumpost/b3abe06121\s|\sforum\spost\sb3abe06121])\sand\sa\scompiler\swarning\s([forum:/forumpost/3db6aa9ed6\s|\sforum\spost\s3db6aa9ed6])\sin\sthe\sshell\stool\scode.
+D 2025-09-25T10:50:11.734
 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 e5e026250288d281b831d48194d4580c0ff978b6843c311f0e557b83217f1441
+F src/shell.c.in 7fd0f0ec9504660479418989311d6ce89795859d855b717c1f734e57e10ad112
 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 d77b8ad96c695594668cd7019c7f607fe5efa5474dde0ece8b621051cf88a0b5
-R d3d3827aa937777d334e6c0d974945e8
-U drh
-Z 4aefb538d372027ea7fd4e97fd0cd05e
+P 023365228f3264c53263b649365e7c133d8633010baf6e050fdee044a40454dd
+R 5e2838f1c95de0e7cf5454102088f76d
+U dan
+Z 2b43521200e07db22475b0fe9d625195
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f8e772a6dc..5159a40916 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-023365228f3264c53263b649365e7c133d8633010baf6e050fdee044a40454dd
+39925489b347ec3126389c6dba1ee719373e50c6cea6944384a212c3a3e163d2
diff --git a/src/shell.c.in b/src/shell.c.in
index 8637056178..485ce6d8ce 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -1133,7 +1133,7 @@ static sqlite3_int64 integerValue(const char *zArg){
   if( isNeg && v>0x7fffffffffffffffULL ) goto integer_overflow;
   return isNeg? -(sqlite3_int64)v : (sqlite3_int64)v;
 integer_overflow:
-  return isNeg ? 0x8000000000000000LL : 0x7fffffffffffffffLL;
+  return isNeg ? (i64)0x8000000000000000LL : 0x7fffffffffffffffLL;
 }
 
 /*
@@ -1142,8 +1142,8 @@ integer_overflow:
 typedef struct ShellText ShellText;
 struct ShellText {
   char *z;
-  int n;
-  int nAlloc;
+  i64 n;
+  i64 nAlloc;
 };
 
 /*