From: drh <drh@noemail.net>
Date: Thu, 2 Jan 2020 15:02:08 +0000 (+0000)
Subject: Fix the OP_Move opcode so that it correctly manages dependency tracking.
X-Git-Tag: version-3.31.0~93
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4cbd847a910091a2da56b0bc0a631b240ff52784;p=thirdparty%2Fsqlite.git

Fix the OP_Move opcode so that it correctly manages dependency tracking.
This change impacts debugging builds only.

FossilOrigin-Name: 5377add4b8af8c52d0a32f5273835ac6bdc42cfb2a95ffcb335b987437a91aa6
---

diff --git a/manifest b/manifest
index 7ebefd3b60..e09aa20a60 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhancements\sto\said\stesting\sand\sdebugging:\nIn\sPRAGMA\svdbe_trace=on\soutput,\sshow\spScopyFrom\sdependencies\son\sregister\nvalues.\s\sAdd\sthe\ssqlite3VdbeRegisterDump()\sprocedure,\scallable\sfrom\sa\ndebugger,\sthat\sshows\sthe\svalues\sof\sall\sregisters.\s\sPass\sthe\sVDBE\spointer\ninto\stest_trace_breakpoint()\sso\sthat\ssqlite3VdbeRegisterDump()\sis\scallable\nfrom\sthe\sbreakpoint.
-D 2020-01-02T14:42:42.874
+C Fix\sthe\sOP_Move\sopcode\sso\sthat\sit\scorrectly\smanages\sdependency\stracking.\nThis\schange\simpacts\sdebugging\sbuilds\sonly.
+D 2020-01-02T15:02:08.865
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -600,13 +600,13 @@ F src/upsert.c 2920de71b20f04fe25eb00b655d086f0ba60ea133c59d7fa3325c49838818e78
 F src/utf.c 2f0fac345c7660d5c5bd3df9e9d8d33d4c27f366bcfb09e07443064d751a0507
 F src/util.c 2c92bc706bbdb1c45a25180291e7e05a56e297aa5dd7b2bcd2b1c47e8bb05b17
 F src/vacuum.c 82dcec9e7b1afa980288718ad11bc499651c722d7b9f32933c4d694d91cb6ebf
-F src/vdbe.c 62f0a6d1d5685b65530f93e5ad4fc852fe7ce8225b8852c67f7177f4748c72d0
+F src/vdbe.c af35d7adef9dcb23fb7b379453eadcf5c5840037a540924c3cac9b4328e09c9a
 F src/vdbe.h 3f068f00b23aebf392df142312ab5874588371c6d83e60d953f6d6b6453491c5
 F src/vdbeInt.h e02ccac0334f7c71c952210657e6e18de1917605887c7bc6167a80a17f62da18
 F src/vdbeapi.c 1252d80c548711e47a6d84dae88ed4e95d3fbb4e7bd0eaa1347299af7efddf02
 F src/vdbeaux.c 83b666882a55bd2762cec9dc32cd71b71d053890253a3d7c9646d59abfcb3381
 F src/vdbeblob.c 253ed82894924c362a7fa3079551d3554cd1cdace39aa833da77d3bc67e7c1b1
-F src/vdbemem.c e5c0fbadf3ad9e45623a63825dc45a30ef0b9b9137ba5351b57d15a3a17aff5d
+F src/vdbemem.c 30c13916dd6516a52330540a3e4bf15ac9886940cf6c6a6a6c66273a1c6b5176
 F src/vdbesort.c a3be032cc3fee0e3af31773af4a7a6f931b7230a34f53282ccf1d9a2a72343be
 F src/vdbetrace.c fa3bf238002f0bbbdfb66cc8afb0cea284ff9f148d6439bc1f6f2b4c3b7143f0
 F src/vtab.c a2fead3e97fca54fcf3f3db784e17c9ee2d39a0c5ad323e9d514855106300a86
@@ -1018,7 +1018,7 @@ F test/fuzzdata4.db b502c7d5498261715812dd8b3c2005bad08b3a26e6489414bd13926cd3e4
 F test/fuzzdata5.db e35f64af17ec48926481cfaf3b3855e436bd40d1cfe2d59a9474cb4b748a52a5
 F test/fuzzdata6.db 92a80e4afc172c24f662a10a612d188fb272de4a9bd19e017927c95f737de6d7
 F test/fuzzdata7.db e7a86fd83dda151d160445d542e32e5c6019c541b3a74c2a525b6ac640639711
-F test/fuzzdata8.db 09733ef4b4246cd97e4513ee315c2900771ead4cc6a5ff83cb511dd43cfc5a43
+F test/fuzzdata8.db d702762f8bf21456a6b69d15dde3e3023733da01ed6f1c06fe50d0b2d161199f
 F test/fuzzer1.test 3d4c4b7e547aba5e5511a2991e3e3d07166cfbb8
 F test/fuzzer2.test a85ef814ce071293bce1ad8dffa217cbbaad4c14
 F test/fuzzerfault.test 8792cd77fd5bce765b05d0c8e01b9edcf8af8536
@@ -1853,7 +1853,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 49a6368c384178653cb3ccb58cc8eff93327c16929bf79eeefeb13a4ce897153
-R cbc77bfc0e90f07a788c6fc62ef01b63
+P 9886cb4b7987f720aa9d701222ab0987caa0ab8c5d216cb6e523c4a45366dfe5
+R 24a07003701b78db81971cb6840d91ff
 U drh
-Z 908b39c48323f7d785aae70d03f5f0a5
+Z 4a934f9df899c177f571c59121e59bde
diff --git a/manifest.uuid b/manifest.uuid
index 4406375c59..7638175920 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9886cb4b7987f720aa9d701222ab0987caa0ab8c5d216cb6e523c4a45366dfe5
\ No newline at end of file
+5377add4b8af8c52d0a32f5273835ac6bdc42cfb2a95ffcb335b987437a91aa6
\ No newline at end of file
diff --git a/src/vdbe.c b/src/vdbe.c
index ab5e4c8048..e11564b17c 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -1371,8 +1371,13 @@ case OP_Move: {
     memAboutToChange(p, pOut);
     sqlite3VdbeMemMove(pOut, pIn1);
 #ifdef SQLITE_DEBUG
-    if( pOut->pScopyFrom>=&aMem[p1] && pOut->pScopyFrom<pOut ){
-      pOut->pScopyFrom += pOp->p2 - p1;
+    pIn1->pScopyFrom = 0;
+    { int i;
+      for(i=1; i<p->nMem; i++){
+        if( aMem[i].pScopyFrom==pIn1 ){
+          aMem[i].pScopyFrom = pOut;
+        }
+      }
     }
 #endif
     Deephemeralize(pOut);
diff --git a/src/vdbemem.c b/src/vdbemem.c
index aaeda24253..e817996950 100644
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -954,7 +954,7 @@ int sqlite3VdbeMemTooBig(Mem *p){
 void sqlite3VdbeMemAboutToChange(Vdbe *pVdbe, Mem *pMem){
   int i;
   Mem *pX;
-  for(i=0, pX=pVdbe->aMem; i<pVdbe->nMem; i++, pX++){
+  for(i=1, pX=pVdbe->aMem+1; i<pVdbe->nMem; i++, pX++){
     if( pX->pScopyFrom==pMem ){
       if( pVdbe->db->flags & SQLITE_VdbeTrace ){
         sqlite3DebugPrintf("Invalidate R[%d] due to change in R[%d]\n",
diff --git a/test/fuzzdata8.db b/test/fuzzdata8.db
index 108bcad778..05f07ad4bb 100644
Binary files a/test/fuzzdata8.db and b/test/fuzzdata8.db differ