From: drh <>
Date: Thu, 14 Apr 2022 12:59:25 +0000 (+0000)
Subject: Fix assert() statements associated with artifical null-value cursors
X-Git-Tag: version-3.39.0~206^2~58^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eab6c125bd9e68867cee6ee538e0d305e6f59ab3;p=thirdparty%2Fsqlite.git

Fix assert() statements associated with artifical null-value cursors
created by RIGHT JOIN.

FossilOrigin-Name: f5bce5f152259767497ae6826c558003822d976b3f35f4d74edee59a3490efb2
---

diff --git a/manifest b/manifest
index f41fb698fc..5f89ed4c4b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sharmless\s(false-positive)\sunused\svariable\scompiler\swarning\son\sMSVC.
-D 2022-04-13T19:00:57.522
+C Fix\sassert()\sstatements\sassociated\swith\sartifical\snull-value\scursors\ncreated\sby\sRIGHT\sJOIN.
+D 2022-04-14T12:59:25.672
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -624,11 +624,11 @@ F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c 602fe229f32a96ceccae4f40824129669582096f7c355f53dbac156c9fecef23
 F src/vacuum.c 6c38ddc52f0619865c91dae9c441d4d48bf3040d7dc1bc5b22da1e45547ed0b3
-F src/vdbe.c 3ad67541cde0b63a096d2e6bb8257d4b6018c997999d67a5a984f4cec304e633
+F src/vdbe.c df6107a37d3ee11ac94bb847aa8817894dd3a279bfc8b928c36f1b697201e3db
 F src/vdbe.h 89f5edb1422c8783a0b29db836e409876f2b3e847f78e2b21b1fbcc48a93f85f
-F src/vdbeInt.h 5f3d0abcf30c2b7a6672ad4386f18be0fca9c9b2cefe18f85a2e3df74f2613bf
+F src/vdbeInt.h ef43f7fdc5fde29fc3fd29c506c12830f366178fdb4edbbf0cbc3dfbd1278b5f
 F src/vdbeapi.c 354c893f1500cf524cc45c32879b9c68893a28b77e3442c24668d6afe4236217
-F src/vdbeaux.c baafd56664ccca4cf361a48b912f7ff37f95ee19aaf7cada420ce2ca73396833
+F src/vdbeaux.c c1718405a9ce07d84adc5bc36e17016f73170de1015d818bc82ebfdf76d88bad
 F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
 F src/vdbemem.c 7189090b72baa025f945a1ac8c61ee420c645254476e8a191d555db76dfea5d4
 F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
@@ -1947,8 +1947,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 185d2720e7775e3060a1647353c10aada435244db53a0732ee786788a6ecae3f
-R fcfe56f1e9aa9c1e774f8b3416754aa1
+P 63b04c63de680261a0d3eaf27154a1e8e77e3e166c3f2dbaea985603991c74f7
+R 9bf8e7ee771780f4b1d0790385799db1
 U drh
-Z a0e8c96182df0ebcaf49be445aec0e16
+Z d30e0e99e2bb4c65405c63a835afccc6
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 066704d872..9e67c5cbd0 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-63b04c63de680261a0d3eaf27154a1e8e77e3e166c3f2dbaea985603991c74f7
\ No newline at end of file
+f5bce5f152259767497ae6826c558003822d976b3f35f4d74edee59a3490efb2
\ No newline at end of file
diff --git a/src/vdbe.c b/src/vdbe.c
index 1cc0a422c3..5f018f200e 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -6264,9 +6264,9 @@ case OP_IdxRowid: {           /* out2 */
   assert( pOp->p1>=0 && pOp->p1<p->nCursor );
   pC = p->apCsr[pOp->p1];
   assert( pC!=0 );
-  assert( pC->eCurType==CURTYPE_BTREE );
+  assert( pC->eCurType==CURTYPE_BTREE || IsNullCursor(pC) );
   assert( pC->uc.pCursor!=0 );
-  assert( pC->isTable==0 );
+  assert( pC->isTable!=0 || IsNullCursor(pC) );
   assert( pC->deferredMoveto==0 );
   assert( !pC->nullRow || pOp->opcode==OP_IdxRowid );
 
diff --git a/src/vdbeInt.h b/src/vdbeInt.h
index b07aee0c05..2a2e403173 100644
--- a/src/vdbeInt.h
+++ b/src/vdbeInt.h
@@ -134,6 +134,11 @@ struct VdbeCursor {
   u32 aType[1];           /* Type values record decode.  MUST BE LAST */
 };
 
+/* Return true if P is a null-only cursor
+*/
+#define IsNullCursor(P) \
+  ((P)->eCurType==CURTYPE_PSEUDO && (P)->nullRow && (P)->seekResult==0)
+
 
 /*
 ** A value for VdbeCursor.cacheStatus that means the cache is always invalid.
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index cb2433c2cd..f598b0d545 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -3549,7 +3549,7 @@ int SQLITE_NOINLINE sqlite3VdbeHandleMovedCursor(VdbeCursor *p){
 ** if need be.  Return any I/O error from the restore operation.
 */
 int sqlite3VdbeCursorRestore(VdbeCursor *p){
-  assert( p->eCurType==CURTYPE_BTREE );
+  assert( p->eCurType==CURTYPE_BTREE || IsNullCursor(p) );
   if( sqlite3BtreeCursorHasMoved(p->uc.pCursor) ){
     return sqlite3VdbeHandleMovedCursor(p);
   }