Improved assert() statements on the OP_Column opcode.

FossilOrigin-Name: c538601e4c979ee59f18d19e6eb6296cebfa580fb029a18d5a3f0dd9393acb75

diff --git a/manifest b/manifest
index de88cfc6df0176482358526b903c53197f9047aa..b1fe521203a68e62d50eb61ed16e66239cd433f7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Load\snew\sdbsqlfuzz\stest\scases\sinto\stest/fuzzdata8.db.
-D 2019-12-20T14:24:26.858
+C Improved\sassert()\sstatements\son\sthe\sOP_Column\sopcode.
+D 2019-12-20T14:37:56.333
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -599,7 +599,7 @@ F src/upsert.c b445315c8958d8f17ec3297d06842e61dacaad0633ccaec1e4e160de7e562212
 F src/utf.c 2f0fac345c7660d5c5bd3df9e9d8d33d4c27f366bcfb09e07443064d751a0507
 F src/util.c 2c92bc706bbdb1c45a25180291e7e05a56e297aa5dd7b2bcd2b1c47e8bb05b17
 F src/vacuum.c 82dcec9e7b1afa980288718ad11bc499651c722d7b9f32933c4d694d91cb6ebf
-F src/vdbe.c ab3f6e647235fe4fa16b71496468313a1da435eb3a2125c3ffdbb0be0d1cbcba
+F src/vdbe.c d25f832beebc6d6ff8b43cbf1bf4365956f093bf4d0d23b3d013fb9508651b53
 F src/vdbe.h fdbc0a11e5768a702b46ce63286f60e22e71351a29bd98b3666405e1fccc7802
 F src/vdbeInt.h bd589b8b7273286858950717e0e1ec5c88b18af45079a3366dc1371865cea704
 F src/vdbeapi.c 1252d80c548711e47a6d84dae88ed4e95d3fbb4e7bd0eaa1347299af7efddf02
@@ -1852,7 +1852,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 365dd8b663d5a28af33556b2b3820c6b5482114ef741a1d82b55c6e154f3043a
-R 391bc913242d8068669e26730228b553
+P 01aeeb5c4c70a0f19651448e94ad5c6810cab3d6957b5bc7a9b4b8e0b887f3de
+R 8c8e8e6b8d389d9f08b357f1209875c4
 U drh
-Z f7fd0aeb069aafb626c2df863cafb54d
+Z 5d106434f9ac2c247c34a9b8c32a6030

diff --git a/manifest.uuid b/manifest.uuid
index 655d321725abeb8389a0558128fe43931fca4be0..09a7c7d32f8324cb7f67caa94a35bf80425d21f2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-01aeeb5c4c70a0f19651448e94ad5c6810cab3d6957b5bc7a9b4b8e0b887f3de
\ No newline at end of file
+c538601e4c979ee59f18d19e6eb6296cebfa580fb029a18d5a3f0dd9393acb75
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index 33c5882bca4c3e70aeebf6cafe3bd819b72bff14..feb14a879d9b41d4b3308ba59def5789da5a06de 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -2549,7 +2549,9 @@ case OP_Column: {
   u32 t;             /* A type code from the record header */
   Mem *pReg;         /* PseudoTable input register */
 
+  assert( pOp->p1>=0 && pOp->p1<p->nCursor );
   pC = p->apCsr[pOp->p1];
+  assert( pC!=0 );
   p2 = pOp->p2;
 
   /* If the cursor cache is stale (meaning it is not currently point at
@@ -2561,7 +2563,6 @@ case OP_Column: {
   assert( pOp->p3>0 && pOp->p3<=(p->nMem+1 - p->nCursor) );
   pDest = &aMem[pOp->p3];
   memAboutToChange(p, pDest);
-  assert( pOp->p1>=0 && pOp->p1<p->nCursor );
   assert( pC!=0 );
   assert( p2<pC->nField );
   aOffset = pC->aOffset;