From: drh <>
Date: Sat, 25 Mar 2023 18:33:42 +0000 (+0000)
Subject: The fix at [13c8c60bb6b4447b] was incomplete in that it failed to clear
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d6f2b49030091b546ceb907fbba64448cf850831;p=thirdparty%2Fsqlite.git

The fix at [13c8c60bb6b4447b] was incomplete in that it failed to clear
the reusable register cache that might contain registers in the STAT4
buffer region.  This additional change corrects the problem.

FossilOrigin-Name: 671bf6f5320bb3add6c897b2c3c78db504d3f0a21ba5347247bc9073ef669f55
---

diff --git a/manifest b/manifest
index ccc0cf2fe2..e0a39e96b0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\sin\scursor-hints\sfor\sWITHOUT\sROWID\stables.
-D 2023-03-25T02:02:10.028
+C The\sfix\sat\s[13c8c60bb6b4447b]\swas\sincomplete\sin\sthat\sit\sfailed\sto\sclear\nthe\sreusable\sregister\scache\sthat\smight\scontain\sregisters\sin\sthe\sSTAT4\nbuffer\sregion.\s\sThis\sadditional\schange\scorrects\sthe\sproblem.
+D 2023-03-25T18:33:42.474
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -554,7 +554,7 @@ F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
 F sqlite_cfg.h.in baf2e409c63d4e7a765e17769b6ff17c5a82bbd9cbf1e284fd2e4cefaff3fcf2
 F src/alter.c 3ca2f449c890f8b86ec9e06f0c4fccf0648941c3308a16904cb2852227db83f7
-F src/analyze.c 26e68072d62d0a28b2dd8619f76be876db9b4ff6e8ad1fd4ed3ac56b1cb045c4
+F src/analyze.c 6a7af762bb64bcb1954db905cf158c3eb3d0d31ff5acc946e7855c0f31728b9d
 F src/attach.c cc9d00d30da916ff656038211410ccf04ed784b7564639b9b61d1839ed69fd39
 F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
 F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7
@@ -2045,9 +2045,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 44c76f001af0d4e48b3e3a8d6a5bc1dedec5afee82d4d3a37562a330a79cc052
-Q +221fdcec964f8317b2c23e926cc23799615cd3b4239a8a9ff87a83588d05bc64
-R bd3db02ba21acb1cbc091ad4a1a1c885
+P fc8ec188d943245ce10595aecf4095d3077f5fbafdeef7de8183afe9ad26eaf7
+Q +5d554e4d0f59a4309fed40e4fb26c7be42f1d4d55ccdcaaf7b4d445aa3122955
+R 9b3b63b10d0f39bb313cef16c904b71a
 U drh
-Z a7ed5b2895ab0c71f3df263f01aabca7
+Z 16f75e412c572f7268b1b1567e115867
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 5d835bcfeb..b67e1f827f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fc8ec188d943245ce10595aecf4095d3077f5fbafdeef7de8183afe9ad26eaf7
\ No newline at end of file
+671bf6f5320bb3add6c897b2c3c78db504d3f0a21ba5347247bc9073ef669f55
\ No newline at end of file
diff --git a/src/analyze.c b/src/analyze.c
index 2eaabd6be4..9e0a0c5e6b 100644
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -1297,6 +1297,21 @@ static void analyzeOneTable(
         /* Allocate space to compute results for the largest index */
         pParse->nMem = MAX(pParse->nMem, regCol+mxCol);
         doOnce = 0;
+#ifdef SQLITE_DEBUG
+        /* Verify that setting pParse->nTempReg to zero below really
+        ** is needed in some cases, in order to excise all temporary
+        ** registers from the middle of the STAT4 buffer.  
+        ** https://sqlite.org/forum/forumpost/83cb4a95a0 (2023-03-25)
+        */
+        if( pParse->nTempReg>0 ){
+          int kk;
+          for(kk=0; kk<pParse->nTempReg; kk++){
+            int regT = pParse->aTempReg[kk];
+            testcase( regT>=regCol && regT<regCol+mxCol );
+          }
+        }
+#endif
+        pParse->nTempReg = 0;
       }
 
       addrNext = sqlite3VdbeCurrentAddr(v);