From 4132f00833c5b7596167ef62bc15ca4b40bcb330 Mon Sep 17 00:00:00 2001 From: drh <> Date: Thu, 15 Oct 2026 17:09:41 +0000 Subject: [PATCH] Fix a missing term on an assert() added by the previous check-in. FossilOrigin-Name: 59dec753df9eef252776b7d9937db43b0e0843c9791d6dcccda2ed4dad31ee2b --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/where.c | 8 +++++--- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/manifest b/manifest index ac9aa4859d..566e696617 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C When\sa\ssingle\sloop\suses\san\sIN(...)\sexpression\sand\sa\sLIKE/GLOB\sexpression\swith\san\sindex,\snest\sthe\s2-iteration\sloop\sthat\sscans\sranges\sof\stext\sand\sblob\svalues\susing\sthe\sLIKE/GLOB\spattern\sinside\sthe\sIN(...)\sloop\sin\sorder\sto\sensure\sthat\sresults\sare\sscanned\sin\sindex\sorder.\sReport\s[bugs:/info/2026-10-13T18:54:28Z\s|\s2026-10-13T18:54:28Z]. -D 2026-10-15T15:33:09.085 +C Fix\sa\smissing\sterm\son\san\sassert()\sadded\sby\sthe\sprevious\scheck-in. +D 2026-10-15T17:09:41.337 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -886,7 +886,7 @@ F src/vxworks.h 9d18819c5235b49c2340a8a4d48195ec5d5afb637b152406de95a9436beeaeab F src/wal.c 41438914e455bbc42ccff8545eab4c711f91233e480337e44a3d5fdf121fce74 F src/wal.h c6251cfc1950643a976625ca452e46dc9b466b4f5dd2e85f244f29f79bf68ace F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014 -F src/where.c e3373734cf74e7b52a786db5d14beb8d73b937bd947d7eff1a9dc360c52745e7 +F src/where.c 5b68fdbca9b0e636bf84274f3e30a1bafcc91bb8f79590c36647c343669b9952 F src/whereInt.h 5d739acb94bf1fdf6edd502a919e3dcf2d340dda63cc1827304e119ea878f6f3 F src/wherecode.c 69ff3d0fe8697d2ca482d25c15dfdc08cf8e4605ab5ab297e9d12b3dbc6812fd F src/whereexpr.c 76f72a95c5cf0e8a8edb679ca4fb7afa17ba45ff4effe73c414266510109e701 @@ -2290,8 +2290,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P a0f9daf75b2fc0b230e9d2b79eab9e495a911f39d7427eb5ec09f5414d8703b7 -R 3fedb2628e1212451a990a8e79205119 -U dan -Z 6307e8e29ee9911f6e6ceee7d948f13d +P 08e979525ff1eef80c8e824c80cca7b6a3dfb320122258803673ace43c806c9a +R c9c2ea0031d1530b79634b6d9ef1df1d +U drh +Z b265331a6cc549970739296a0997909b # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 32b5ef8557..3e4ef4e128 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -08e979525ff1eef80c8e824c80cca7b6a3dfb320122258803673ace43c806c9a +59dec753df9eef252776b7d9937db43b0e0843c9791d6dcccda2ed4dad31ee2b diff --git a/src/where.c b/src/where.c index 5099b846c2..32581855bb 100644 --- a/src/where.c +++ b/src/where.c @@ -7665,16 +7665,18 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){ } } if( pLevel->addrNxt!=pLevel->addrBrk ){ - /* This occurs in two cases - (a) for a LIKE/GLOB scan that must visit + /* This occurs in three cases - (a) for a LIKE/GLOB scan that must visit ** ranges of text and blob values separately, and (b) when there is - ** an IN(...) constraint driving the index. This is asserted() in the - ** next block, inside the #ifndef. */ + ** an IN(...) constraint driving the index, and (c) when a prior error + ** such as an OOM has left us in an unusual state. This is asserted() + ** in the next block, inside the #ifndef. */ sqlite3VdbeResolveLabel(v, pLevel->addrNxt); } #ifndef SQLITE_LIKE_DOESNT_MATCH_BLOBS assert( (pLevel->addrNxt==pLevel->addrBrk) || (pLevel->addrLikeRep) /* (a) */ || ((pLoop->wsFlags & WHERE_IN_ABLE) && pLevel->u.in.nIn>0) /* (b) */ + || pWInfo->pParse->nErr>0 /* (c) */ ); if( pLevel->addrLikeRep ){ /* The LIKE optimization loop is nested inside any IN(...) and