Remove an ALWAYS() and NEVER() in the authorizer that become reachable

as of [078dbff04a95a001].  Test case for coverage in TH3.

FossilOrigin-Name: b469327e2949352325d3db815bd4782f9734239c378f08afd2f00ffa54bef924

diff --git a/manifest b/manifest
index fb1bc225427be8b9390a42128d9be4d04bbdb63f..8f740e87d1c2c464c71ca50e1939f00d7bba3e7c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sOSSFuzz-discovered\sshift\sproblem\sfrom\stwo\sdays\sago.\s\sThis\spatch\swas\nomitted\sfrom\s[078dbff04a95a001]\sapparently\sbecause\sI\smade\sthe\sedit\sto\n"sqlite3.c"\srather\sthan\s"resolve.c"\swhere\sit\sbelongs.
-D 2021-02-06T14:37:36.326
+C Remove\san\sALWAYS()\sand\sNEVER()\sin\sthe\sauthorizer\sthat\sbecome\sreachable\nas\sof\s[078dbff04a95a001].\s\sTest\scase\sfor\scoverage\sin\sTH3.
+D 2021-02-06T14:56:30.179
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -478,7 +478,7 @@ F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
 F src/alter.c 36cae0d6e3e91a1996e1a472f8c7242c31a4e38ba4295e3056da198c04fd2a87
 F src/analyze.c 01c6c6765cb4d40b473b71d85535093730770bb186f2f473abac25f07fcdee5c
 F src/attach.c e80162a47411f296bea550ed8fafd730481f4aa71e89ece23ba9c957eed15d4a
-F src/auth.c 807c65bbe66806cd0a4b1cf2dbda12023002093b2c572e94a783f48b60e64441
+F src/auth.c 08954fdc4cc2da5264ba5b75cfd90b67a6fc7d1710a02ccf917c38eadec77853
 F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
 F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
@@ -1899,7 +1899,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 078dbff04a95a001bbd8690ab08038fbb5506899df8290991b53fd1122a4c30c
-R e6748b9d1b630db8f8b3410473bbf7b2
+P 864772ffec4e91d8d73f9b97e6e1d7bd4e0537de19d11d30aed7eedd5b7d394a
+R b1f31e46f151931adb314ae288cc333a
 U drh
-Z 80bacc1d0dff416297cd42e4085d2a09
+Z 9c38539633f74e19146c1878e4331de3

diff --git a/manifest.uuid b/manifest.uuid
index aae9390c7c767ba7e0d94ecced59b93156a54207..556d728f41d2edc851f3d14c2ef29b7e78b8bc0a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-864772ffec4e91d8d73f9b97e6e1d7bd4e0537de19d11d30aed7eedd5b7d394a
\ No newline at end of file
+b469327e2949352325d3db815bd4782f9734239c378f08afd2f00ffa54bef924
\ No newline at end of file

diff --git a/src/auth.c b/src/auth.c
index 48b1c42beb1e5d7e4c74759002bef5b42790c2e2..33420f583942967281dc5365d7bda8a4bbf9cbb9 100644 (file)
--- a/src/auth.c
+++ b/src/auth.c
@@ -163,7 +163,7 @@ void sqlite3AuthRead(
     pTab = pParse->pTriggerTab;
   }else{
     assert( pTabList );
-    for(iSrc=0; ALWAYS(iSrc<pTabList->nSrc); iSrc++){
+    for(iSrc=0; iSrc<pTabList->nSrc; iSrc++){
       if( pExpr->iTable==pTabList->a[iSrc].iCursor ){
         pTab = pTabList->a[iSrc].pTab;
         break;
@@ -171,7 +171,7 @@ void sqlite3AuthRead(
     }
   }
   iCol = pExpr->iColumn;
-  if( NEVER(pTab==0) ) return;
+  if( pTab==0 ) return;
 
   if( iCol>=0 ){
     assert( iCol<pTab->nCol );