diff options
| author | drh <> | 2023-11-20 13:06:59 +0000 |
|---|---|---|
| committer | drh <> | 2023-11-20 13:06:59 +0000 |
| commit | 0fcaf16f20a1a9c38aa740f41941f86134b7ada8 (patch) | |
| tree | 9d5c3e58caaa6b250c475871d0b975ceb0f82057 | |
| parent | 56bb07bad6fbb73c0f5631a6399bf1ba627c817b (diff) | |
| download | sqlite-0fcaf16f20a1a9c38aa740f41941f86134b7ada8.tar.gz sqlite-0fcaf16f20a1a9c38aa740f41941f86134b7ada8.zip | |
Convert an assert in OP_VCheck into a branch that aborts the opcode, as this
can happen on some very obscure conditions, as discovered by dbsqlfuzz.
Test case in TH3.
FossilOrigin-Name: 7946c79567b0ccd3a00d12390e99896d7dc11407d0b52bc39338a16a493f56f6
| -rw-r--r-- | manifest | 14 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/vdbe.c | 2 |
3 files changed, 9 insertions, 9 deletions
@@ -1,5 +1,5 @@ -C Fix\san\sassert()\sin\sfts5\sthat\scould\sbe\strue\sfollowing\san\sOOM\sor\sIO\serror\sin\scontentless-delete\smode. -D 2023-11-20T11:40:18.032 +C Convert\san\sassert\sin\sOP_VCheck\sinto\sa\sbranch\sthat\saborts\sthe\sopcode,\sas\sthis\ncan\shappen\son\ssome\svery\sobscure\sconditions,\sas\sdiscovered\sby\sdbsqlfuzz.\nTest\scase\sin\sTH3. +D 2023-11-20T13:06:59.104 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -795,7 +795,7 @@ F src/upsert.c fa125a8d3410ce9a97b02cb50f7ae68a2476c405c76aa692d3acf6b8586e9242 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0 F src/util.c b22cc9f203a8c0b9ee5338a67f8860347d14845864c10248bebe84518a781677 F src/vacuum.c 604fcdaebe76f3497c855afcbf91b8fa5046b32de3045bab89cc008d68e40104 -F src/vdbe.c 04b827a4ef155cb529bb36f828d46407eeb39cbfa4ce6a5e6eb862040d247e59 +F src/vdbe.c 319af2cf092d20e233e8ad4267ae49bfe33c50ac4db4ee7e47af898f824c2368 F src/vdbe.h 41485521f68e9437fdb7ec4a90f9d86ab294e9bb8281e33b235915e29122cfc0 F src/vdbeInt.h 949669dfd8a41550d27dcb905b494f2ccde9a2e6c1b0b04daa1227e2e74c2b2c F src/vdbeapi.c b07df805110dc6e81f2a3f9cd4e83f56ea523277a59bcec489a12b740c1079e7 @@ -2140,8 +2140,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 91c888eddbcb1b461f7d562c2f0eee57f1a2be7f9959b9d69e80fc7c1da20e9e -R aacc5daf648064d816701ed024ac5a70 -U dan -Z d2599b0e9e0464d6a1e8d44fb28dd315 +P 3fe89238c31ca163d021ef1fecde594328815aaba7053fef9e9c789562a62f45 +R 023252c7b46c4247f78e158002469cb0 +U drh +Z 2185395a736aba37940a68778fd45ab3 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 97e9012ba..bfd0c9231 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -3fe89238c31ca163d021ef1fecde594328815aaba7053fef9e9c789562a62f45
\ No newline at end of file +7946c79567b0ccd3a00d12390e99896d7dc11407d0b52bc39338a16a493f56f6
\ No newline at end of file diff --git a/src/vdbe.c b/src/vdbe.c index 4ea508032..38155a170 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -8184,7 +8184,7 @@ case OP_VCheck: { /* out2 */ pTab = pOp->p4.pTab; assert( pTab!=0 ); assert( IsVirtual(pTab) ); - assert( pTab->u.vtab.p!=0 ); + if( pTab->u.vtab.p==0 ) break; pVtab = pTab->u.vtab.p->pVtab; assert( pVtab!=0 ); pModule = pVtab->pModule; |