The OP_Eq and OP_Ne operators have a special P5 value SQLITE_NOTNULL that

asserts that the values are not null.  Except that is not always true for
a corrupt database.  Adjust the assert() and add a testcase() to make this
point clear.

FossilOrigin-Name: a3fdb2c78d23b94d68dc08126b22d03152ac6068496a42402cdfb336cd4a7e33

diff --git a/manifest b/manifest
index 4b1f9d96bd4d1010721ace80f61583dd1d69a08e..7536eb08d7dd4d502e3f3cfd6d21374fe764ce62 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\sdbtotxt\sutility\sprogram\sso\sthat\sit\sdoes\snot\soutput\scharacters\sthat\nare\sspecial\sto\sTCL,\sthus\smaking\sthe\soutput\sof\sdbtotxt\seasier\sto\sinsert\sinto\ntest\sscripts.
-D 2018-12-21T22:11:37.526
+C The\sOP_Eq\sand\sOP_Ne\soperators\shave\sa\sspecial\sP5\svalue\sSQLITE_NOTNULL\sthat\nasserts\sthat\sthe\svalues\sare\snot\snull.\s\sExcept\sthat\sis\snot\salways\strue\sfor\na\scorrupt\sdatabase.\s\sAdjust\sthe\sassert()\sand\sadd\sa\stestcase()\sto\smake\sthis\npoint\sclear.
+D 2018-12-22T00:34:30.237
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in d8b254f8bb81bab43c340d70d17dc3babab40fcc8a348c8255881f780a45fee6
@@ -581,7 +581,7 @@ F src/upsert.c 0dd81b40206841814d46942a7337786932475f085716042d0cb2fc7791bf8ca4
 F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
 F src/util.c d9eb0a6c4aae1b00a7369eadd7ca0bbe946cb4c953b6751aa20d357c2f482157
 F src/vacuum.c 3ffe64ecfc94b7528c5d7bdb1c3a19d72fec63f2aa846e3b90f8de5dbbddf5aa
-F src/vdbe.c 8ced1263b0557b5a582ee0af9001f496382eaa65dd2c2e337bbe28f7a512d9a9
+F src/vdbe.c 1f8e6c71c68631b5c4aaa82b84b262577bd29ca3a14871ed308785ee97ef919d
 F src/vdbe.h 8990d668a89890a33326b0a29b992c4014b72f3b6cdcd9ee0e190593c247f9b0
 F src/vdbeInt.h 73f5051923f3f29779bfc374c0c68e23b8e5e3792def2e33e51b427edb890abd
 F src/vdbeapi.c 57a2d794a8833f269b878dbc24e955369bdb379af6c4e93ebc5ce1a20fa3daf4
@@ -1791,7 +1791,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 b39bf4356e6bcf1d8442721d6cbbfe06caba01325104fb469da8fe69e1f623a2
-R 3408a85b9c4129beca4542bd35c340d6
+P 48438bb35b48955a1df83ef90f0ef6c9cfed0b16d2e938f36d74ad9d53b4b5b4
+R a1119671160e13dd3f8e45b4746b6deb
 U drh
-Z a34a043ff225af5ec4da7a2cecb32954
+Z 6d5d2ec099df2e3076f32a96505c2c41

diff --git a/manifest.uuid b/manifest.uuid
index 5ee71b60c7626fd530398bd36cbbb273e7b96df4..a9f7bf0017e2d40d5ce021afa23cd0f739af6657 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-48438bb35b48955a1df83ef90f0ef6c9cfed0b16d2e938f36d74ad9d53b4b5b4
\ No newline at end of file
+a3fdb2c78d23b94d68dc08126b22d03152ac6068496a42402cdfb336cd4a7e33
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index da672e3965eaf0e80b79e778d36dbea4a17a2eb5..590964713c5da90d57835cd79058eba59bbf44d7 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -1925,7 +1925,8 @@ case OP_Ge: {             /* same as TK_GE, jump, in1, in3 */
       */
       assert( pOp->opcode==OP_Eq || pOp->opcode==OP_Ne );
       assert( (flags1 & MEM_Cleared)==0 );
-      assert( (pOp->p5 & SQLITE_JUMPIFNULL)==0 );
+      assert( (pOp->p5 & SQLITE_JUMPIFNULL)==0 || CORRUPT_DB );
+      testcase( (pOp->p5 & SQLITE_JUMPIFNULL)!=0 );
       if( (flags1&flags3&MEM_Null)!=0
        && (flags3&MEM_Cleared)==0
       ){