Fix the same potential integer overflow problem of [5508b56fd24016c1] in

a different and much simpler way.  No error is raised but memory errors are
avoided.

FossilOrigin-Name: ff6b0ddf04e61de143afcd9867ee35317f92e83dfcae98bdd47dddc70d4ca44f

diff --git a/manifest b/manifest
index 50bc6762b03c8b153a23086c479fcd18b4eeee4c..972246cec8b79b6e1d9231c54041ce789c825851 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Increase\sthe\spatch\slevel\sto\s4.
-D 2025-08-01T11:25:39.840
+C Fix\sthe\ssame\spotential\sinteger\soverflow\sproblem\sof\s[5508b56fd24016c1]\sin\na\sdifferent\sand\smuch\ssimpler\sway.\s\sNo\serror\sis\sraised\sbut\smemory\serrors\sare\navoided.
+D 2025-08-01T13:01:33.055
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -485,7 +485,7 @@ F src/date.c b29b349d277e3d579dcc295b24c0a2caed83fd8f090a9f7cbe6070c0fd662384
 F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
 F src/dbstat.c 793deaf88a0904f88285d93d6713c636d55ede0ffd9f08d10f4ea825531d367f
 F src/delete.c 88047c8e59878c920fce14582bc1dde4d81157d1ca5ffdf36c2907e6d41996c4
-F src/expr.c 96cf4c2996a8ff3fe2281d9f3042ec5431ab2cbd793aa30881d992918b473487
+F src/expr.c 619173342d7754f77b5595ce2d43c4ee4899930469ee3e25b022bf6699f40eb7
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 4b575423b0a5d4898b1a7868ce985cf1a8ad91c741c9abbb108ff02536d20f41
 F src/func.c 2333eb4277f55a5efdc12ef754e7d7ec9105d257b2fd00301d23ce1e8fa67dc0
@@ -1866,8 +1866,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 e04ad4f3790062221cda22f2dbfbd7b75c3d11dbe689b8c16494c40214466c1e
-R df3e859253fc265dd4eed2b19fae7f34
+P ddfc959655f0cf74b77cdd76c785874b04eee40978cf09ecb66eb3f740304639
+R 65b869f1750905e9783573f71340ee1c
 U drh
-Z 47f05fbfe751e71b85fe172d1323db43
+Z 56084c229e0aa7793d6ca903a783b594
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 74e4712229e5d6344234f8b00aacedfc2d83c431..0c55d1d95598fd0f5299fa05842504c25a8d29f7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ddfc959655f0cf74b77cdd76c785874b04eee40978cf09ecb66eb3f740304639
+ff6b0ddf04e61de143afcd9867ee35317f92e83dfcae98bdd47dddc70d4ca44f

diff --git a/src/expr.c b/src/expr.c
index c9bec27263f942dfbaec64675596d37a22d25820..4035a8c526d2dba36bacd76f4af1568d641e831f 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -5899,7 +5899,7 @@ static int analyzeAggregate(Walker *pWalker, Expr *pExpr){
             ExprSetVVAProperty(pExpr, EP_NoReduce);
             pExpr->pAggInfo = pAggInfo;
             pExpr->op = TK_AGG_COLUMN;
-            pExpr->iAgg = (i16)k;
+            pExpr->iAgg = (i16)(k&0x7fff);
             break;
           } /* endif pExpr->iTable==pItem->iCursor */
         } /* end loop over pSrcList */