From: drh <> Date: Fri, 24 Jul 2026 14:53:59 +0000 (+0000) Subject: Fix a bug in the check-in [bbd69ce274620008] causing that bug-fix X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=5694c3bb2a6a40770ecd2f65910eea756734dfd8;p=thirdparty%2Fsqlite.git Fix a bug in the check-in [bbd69ce274620008] causing that bug-fix check-in to fail to completely fix the original bug. This fix is in response to the follow-up report at [bugs:/info/2026-07-24T02:52:08Z|Bug 2026-07-24T02:52:08Z]. FossilOrigin-Name: 2cb22877683680c1f89bcc9edb47bd1a4a8755d4a6b846a1a20136a657dacdcc --- diff --git a/manifest b/manifest index 19a5fbdd11..ed600e9eb8 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sproblem\sin\stest1.c\scausing\stest\sscript\swin32lock.test\sto\sfail. -D 2026-07-24T14:10:00.168 +C Fix\sa\sbug\sin\sthe\scheck-in\s[bbd69ce274620008]\scausing\sthat\sbug-fix\ncheck-in\sto\sfail\sto\scompletely\sfix\sthe\soriginal\sbug.\s\sThis\sfix\sis\sin\sresponse\nto\sthe\sfollow-up\sreport\sat\n[bugs:/info/2026-07-24T02:52:08Z|Bug\s2026-07-24T02:52:08Z]. +D 2026-07-24T14:53:59.504 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -740,7 +740,7 @@ F src/pragma.c 789ef67117b74b5be0a2db6681f7f0c55e6913791b9da309aefd280de2c8a74d F src/prepare.c 8954bb69defe377cd6a926f8c61d8215ea4f1974838d3ec6f22681a2c0a2939f F src/printf.c b480176bd0aaed9d64e804cfa3ca27fc585f65a73e7c7ca2fe9b9016db2cf6d5 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c -F src/resolve.c 6bfd1a821e88106b2ef811acc9b7d8f3d7a4524cafe08a4189a8be4d79f2a30a +F src/resolve.c 7145e41ad75e04a811b326aa5faf83c2e071480fabd9fc825055a6b889e6cb86 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c d2ad83d49c41c30d213873bac8481c6bf099438c61dcb597de52ddb55a6324fb F src/shell.c.in 0df571dd1eae1a15577361902eb5487a072d3290ea94e1e72e757050b641f870 @@ -886,7 +886,7 @@ F test/attach2.test 6d1e3a457ce260d6fc8e5945c07fba6c76dc2aa90e1c701f067b50ee88f7 F test/attach3.test c59d92791070c59272e00183b7353eeb94915976 F test/attach4.test 00e754484859998d124d144de6d114d920f2ed6ca2f961e6a7f4183c714f885e F test/attachmalloc.test 67309af95c6b765c13e7d2279d7fccbef78e6eb0565d75d51cefd5dc88784549 -F test/auth.test 194adb09a15b33c56552cb7fdafe1651a0320c903968ba482f4e8d001ed41976 +F test/auth.test 5d91e564796e53b885e5c2ec6554ff5fdbacc1317b8c26aa61adef4b439f5970 F test/auth2.test fb34df35ceca8d24e01219e993a3c1d9cb646e83b434627e158343bda1f6e0da F test/auth3.test 76d20a7fa136d63bcfcf8bcb65c0b1455ed71078d81f22bcd0550d3eb18594ab F test/autoanalyze1.test b9cc3f32a990fa56669b668d237c6d53e983554ae80c0604992e18869a0b2dec @@ -2217,8 +2217,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P 5398c6a2b6b218461ce1f6437791c62c1ee125fba195660e0d6d1ad97ed6d14c -R d3000ffe0536a7cecf8a48202e3ff523 -U dan -Z fb993a1ddeb384f9ce40958bd01d71db +P 8f6d25b3f0171a40be8a5cb646739f54e496aaf9d4829c24c243ec4b71e0caa8 +R da5a0ba531351dab29314a05dfa23519 +U drh +Z b9c3e873adc04f99a45b7704c4847481 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 88a485b089..e26052393e 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -8f6d25b3f0171a40be8a5cb646739f54e496aaf9d4829c24c243ec4b71e0caa8 +2cb22877683680c1f89bcc9edb47bd1a4a8755d4a6b846a1a20136a657dacdcc diff --git a/src/resolve.c b/src/resolve.c index 881264a3b8..9417578be9 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -839,14 +839,13 @@ lookupname_end: #ifndef SQLITE_OMIT_AUTHORIZATION if( db->xAuth ){ if( pFJMatch ){ - int ii; assert( pExpr->op==TK_FUNCTION ); assert( sqlite3_stricmp(pExpr->u.zToken,"coalesce")==0 ); assert( pExpr->x.pList==pFJMatch ); assert( pFJMatch->nExpr>0 ); - for(ii=0; iinExpr; ii++){ - assert( pFJMatch->a[0].pExpr->op==TK_COLUMN ); - sqlite3AuthRead(pParse, pFJMatch->a[0].pExpr, pSchema, pNC->pSrcList); + for(i=0; inExpr; i++){ + assert( pFJMatch->a[i].pExpr->op==TK_COLUMN ); + sqlite3AuthRead(pParse,pFJMatch->a[i].pExpr,pSchema,pNC->pSrcList); } }else if( pExpr->op==TK_COLUMN || pExpr->op==TK_TRIGGER ){ sqlite3AuthRead(pParse, pExpr, pSchema, pNC->pSrcList); diff --git a/test/auth.test b/test/auth.test index cce9a8b4ea..333e6ed272 100644 --- a/test/auth.test +++ b/test/auth.test @@ -2694,7 +2694,7 @@ do_test auth-9.3 { } [list \ SQLITE_SELECT {} {} {} {} \ SQLITE_READ t1 x main {} \ - SQLITE_READ t1 x main {} \ + SQLITE_READ t2 x main {} \ SQLITE_READ t2 y2 main {} \ ]