From ca77c585be6a56b2008488f1d9b68dc51819d2cb Mon Sep 17 00:00:00 2001 From: drh <> Date: Sat, 24 Jan 2026 00:33:41 +0000 Subject: [PATCH] Fix an incorrect assert(). FossilOrigin-Name: b9ce349e1e4166c3d1c97d2f6fb1792b89e3316c8ec182daa032b6655e9c2c17 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/expr.c | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index fcd8b926ae..01cfd86226 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C More\scode\ssimplifications. -D 2026-01-23T18:52:45.880 +C Fix\san\sincorrect\sassert(). +D 2026-01-24T00:33:41.831 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -689,7 +689,7 @@ F src/date.c e19e0cfff9a41bfdd884c655755f6f00bca4c1a22272b56e0dd6667b7ea893a2 F src/dbpage.c c9ea81c11727f27e02874611e92773e68e2a90a875ef2404b084564c235fd91f F src/dbstat.c 73362c0df0f40ad5523a6f5501224959d0976757b511299bf892313e79d14f5c F src/delete.c 901499bed747c3b4b2be45be1abe912ba50a3f6a40ba88cc006ccf279f2d0e97 -F src/expr.c 8109bf7daad7701bd986403effaa9908319fefa71372095ae25e937daea2a2fd +F src/expr.c 20010bd64989c1e4665b50e8c447589004c462c310cb16eec82c9d3abc29879e F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c c065da737307a29e4d240ac727758dbf4102cb3218a1f651eb689b6a6fa12531 F src/func.c efbcfe7cb7fc92fe5299c9aaa141075eb60d2108253e99bc235384ed6a90d937 @@ -2193,8 +2193,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P 423173079ee0911f86a76c9b905d98328f7aae45d43a38a13957c5c510f87670 -R 67a5571aa9647fe169548e942f8eb2eb +P 3d76732a45333f6f3e21667bb018a859d20815243d276fad0dc126d3c667d4aa +R b382f40b273a5b37b79497c83b0a3f58 U drh -Z 0d761c4faefaef01679a03791a7519ed +Z 3f69647551165a004e932f5c9d293729 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 4955c9bc3d..128d41a920 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -3d76732a45333f6f3e21667bb018a859d20815243d276fad0dc126d3c667d4aa +b9ce349e1e4166c3d1c97d2f6fb1792b89e3316c8ec182daa032b6655e9c2c17 diff --git a/src/expr.c b/src/expr.c index 62e3ae62fd..c8f5c57e9f 100644 --- a/src/expr.c +++ b/src/expr.c @@ -4202,7 +4202,8 @@ static void sqlite3ExprCodeIN( const VdbeOp *pOp = sqlite3VdbeGetOp(v, pExpr->y.sub.iAddr); assert( pOp->opcode==OP_Once || pParse->nErr ); if( pOp->p3>0 ){ /* tag-202407032019 */ - assert( OptimizationEnabled(pParse->db, SQLITE_BloomFilter) ); + assert( OptimizationEnabled(pParse->db, SQLITE_BloomFilter) + || pParse->nErr ); sqlite3VdbeAddOp4Int(v, OP_Filter, pOp->p3, destIfFalse, rLhs, nVector); VdbeCoverage(v); } -- 2.47.3