Add an assert() to the byte-code engine that goes off if the OP_Halt opcode

is invoked with SQLITE_INTERNAL.  This causes the RIGHT JOIN error
"Opcode jumps to ... which is outside the subroutine ..." to fail immediately,
causing it to come more readily to tester's attention.  There is at least
one testcase in test/fuzzdata8.db that asserts due to this change.

FossilOrigin-Name: b8f994414285264f4f7c472dfad646a061fc3580b754eac0f20080c24ecc256d

diff --git a/manifest b/manifest
index 204672c33b5300bf0905bcba428b9392df169afe..cc8bbc6bd35e091249f6a68697c2a00f00ebb596 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\sprogress-handler\sand\sinterrupt\sdetection\sduring\sPRAGMA\sintegrity_check.
-D 2023-01-11T16:17:31.352
+C Add\san\sassert()\sto\sthe\sbyte-code\sengine\sthat\sgoes\soff\sif\sthe\sOP_Halt\sopcode\nis\sinvoked\swith\sSQLITE_INTERNAL.\s\sThis\scauses\sthe\sRIGHT\sJOIN\serror\n"Opcode\sjumps\sto\s...\swhich\sis\soutside\sthe\ssubroutine\s..."\sto\sfail\simmediately,\ncausing\sit\sto\scome\smore\sreadily\sto\stester's\sattention.\s\sThere\sis\sat\sleast\none\stestcase\sin\stest/fuzzdata8.db\sthat\sasserts\sdue\sto\sthis\schange.
+D 2023-01-11T16:44:57.242
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -717,7 +717,7 @@ F src/upsert.c 5303dc6c518fa7d4b280ec65170f465c7a70b7ac2b22491598f6d0b4875b3145
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c 0e5cf9062a796f0f1b6b3228b121b2344932c05425f7c8b5a7cb245812473bbd
 F src/vacuum.c 84ce7f01f8a7a08748e107a441db83bcec13970190ddcb0c9ff522adbc1c23fd
-F src/vdbe.c 6b11efa707f92a1f32d31c749609ab5a6acf31c1d95e277f9199ce1901831b1a
+F src/vdbe.c 813c7895fc5516696b7acd5852df470c9ae7f91f46c4dcd7e0bd4e97f8c145b3
 F src/vdbe.h 73b904a6b3bb27f308c6cc287a5751ebc7f1f89456be0ed068a12b92844c6e8c
 F src/vdbeInt.h fc15815b7bdafbb27e7f027faba2b0112e87d382c0d72241672528806ebc0db5
 F src/vdbeapi.c 4ee67890913c1d2469c68e3ad2e7ddeab57ac5924a64bbfd0906a8ea0d542c7f
@@ -2068,8 +2068,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P d030f341369b7f32789cbcf3d0ad9a2ac5cad99a56dac7dfe68b7f06dc339b17
-R 7b76cd997666c81e2de9a02fcc1dc055
+P 6db42780a9e530bcc94490cc6080536309666dc13523272d1799d6661137e908
+R 7452496a34578ebcb2192d17749a2338
+T *branch * code-generator-20220111
+T *sym-code-generator-20220111 *
+T -sym-trunk *
 U drh
-Z 15c60f893bce5ca2030105c4cbb8f7ce
+Z 8538b98284c40a3c08b07910b6f7dc3d
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 51cf90d7be0198d761ddb62116ff7df5e88ae307..7c003a69b5244432170752b05494a99ee4f0817f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6db42780a9e530bcc94490cc6080536309666dc13523272d1799d6661137e908
\ No newline at end of file
+b8f994414285264f4f7c472dfad646a061fc3580b754eac0f20080c24ecc256d
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index f8cffbac4d24d53bb2c62d78a879c2986b492c46..9eb0cb8deeb498c5c733492283431904adbc93ad 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -1150,6 +1150,12 @@ case OP_Halt: {
 #ifdef SQLITE_DEBUG
   if( pOp->p2==OE_Abort ){ sqlite3VdbeAssertAbortable(p); }
 #endif
+
+  /* A deliberately coded "OP_Halt SQLITE_INTERNAL * * * *" opcode indicates
+  ** something is wrong with the code generator.  Raise and assertion in order
+  ** to bring this to the attention of fuzzers and other testing tools. */
+  assert( pOp->p1!=SQLITE_INTERNAL );
+
   if( p->pFrame && pOp->p1==SQLITE_OK ){
     /* Halt the sub-program. Return control to the parent frame. */
     pFrame = p->pFrame;