diff --git a/manifest b/manifest index 5960eddef3..6e4aed7923 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Ensure\sthat\swhen\sa\svalue\sthat\smay\sbe\sstored\swithout\sdata\sloss\sas\san\sinteger\sis\sstored\sin\sa\scolumn\swith\sREAL\saffinity,\sthe\svalues\spassed\sto\sthe\spreupdate-hook\sare\sof\stype\sSQLITE_FLOAT,\snot\sSQLITE_INTEGER.\sReport\s[bugs:/info/2026-10-04T16:18:21Z\s|\s2026-10-04T16:18:21Z]. -D 2026-10-05T11:29:02.005 +C Prevent\sthe\sexpression\sgenerated\sby\sthe\scount-of-view\soptimization\sfrom\ngetting\stoo\sdeep\sand\scausing\sa\sCPU\sstack\soverflow.\n[bugs:/info/2026-10-04T05:34:47Z|Bug\s2026-10-04T05:34:47Z] +D 2026-10-05T12:18:23.826 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -800,7 +800,7 @@ F src/printf.c 4bd228ed9e9346d558362be562757ee5eef6f9bf483b7f02751ca42cf95174d3 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 0e0990f60c93db38c735d85e5d1741130e72dd0670aec204b5a39118b53c8044 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 -F src/select.c 849d9a7474ab5669a2290f087284d3672fc28edcffc043372bb6883cf0ffec10 +F src/select.c 4a3a618a4b800e7805cbb5f66600c3148afb637bb356a585ce4ed7704d9cddfc F src/shell.c.in 8504577eb02e87b58f9d632bc4458efda074476428774692207ddacc0fe9e1df F src/sqlite.h.in 884996e07cfb7681efc76661b79d56a93f9edaea7f6fc4a3c82636dc84783486 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479 @@ -2278,8 +2278,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P f940c67b21b112e33bfdd54f2c3a19b06ad5bf661ddf2f85dd464fb76d115e31 -R d54dc4174e35368b365ed1dab90abee9 -U dan -Z 91bfb1a10c5ca74730896a453bd88857 +P 9f7490065e24fc69a5fc13371aeb40214d617209bb0cd9a3e23f76486d4704c0 +R 932fb3569b3e3e840240d24b9e4a4ce9 +U drh +Z aec6e6d5a2f843fd5690eceafb628e31 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 562085e84e..1a9eb5d237 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9f7490065e24fc69a5fc13371aeb40214d617209bb0cd9a3e23f76486d4704c0 +ab621a3e11ee4accce14bf6c90a7cc273d9c25a7c3d9dd2466f2bdc2bbbf8084 diff --git a/src/select.c b/src/select.c index 0acd800e07..d877f9ad6b 100644 --- a/src/select.c +++ b/src/select.c @@ -7312,6 +7312,10 @@ static int countOfViewOptimization(Parse *pParse, Select *p){ }else{ pExpr = sqlite3PExpr(pParse, TK_PLUS, pTerm, pExpr); } + if( pParse->nErr ){ + sqlite3ExprDelete(db, pExpr); + pExpr = 0; + } pSub = pPrior; } p->pEList->a[0].pExpr = pExpr;