Put a NEVER() on a defensive branch.

FossilOrigin-Name: 40d10e7aad5b899206e45d1f8606470a90a07049e15d94c3811cfe695f3a402e

diff --git a/manifest b/manifest
index 0862ad858bb4bc9f1897309b0f5ba7f61299af50..4787ab53ecb1bdf97a4cedd938f43961575d6faf 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stypo\sin\sa\scomment.\s\sNo\schanges\sto\scode.
-D 2019-12-30T20:42:17.433
+C Put\sa\sNEVER()\son\sa\sdefensive\sbranch.
+D 2019-12-30T20:42:53.391
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -480,7 +480,7 @@ F src/date.c e1d8ac7102f3f283e63e13867acb0efa33861cf34f0faf4cdbaf9fa7a1eb7041
 F src/dbpage.c 135eb3b5e74f9ef74bde5cec2571192c90c86984fa534c88bf4a055076fa19b7
 F src/dbstat.c 6c407e549406c10fde9ac3987f6d734459205239ad370369bc5fcd683084a4fa
 F src/delete.c a5c59b9c0251cf7682bc52af0d64f09b1aefc6781a63592c8f1136f7b73c66e4
-F src/expr.c 3584e19c222f94cd0bb9070318ad270c3ca0d4fe235a6f70a198f16d8faf976f
+F src/expr.c e3bfa38e343dd9181aca4b08f989738200ff6663fcb701c70e93b787ff1e0ddb
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 92a248ec0fa4ed8ab60c98d9b188ce173aaf218f32e7737ba77deb2a684f9847
 F src/func.c ed33e38cd642058182a31a3f518f2e34f4bbe53aa483335705c153c4d3e50b12
@@ -1853,7 +1853,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 ab09ef427181130be09a087b7e572ad4cfb6b3e1b459769ee5ebf046b3ead682
-R 4a6240a737256a34f6c9e47fee5dc4f4
+P d4813a8d813f234e819f8ebefbd3ff96d3d69593cc7d716cf0ad6c1a126da827
+R 7c7e328613a2e7bad0a7dbaa467cbb02
 U drh
-Z 885cb237882e96af1684f4dbf78e7a24
+Z 34edcc088b28c8be45bf2b31cacb6cd0

diff --git a/manifest.uuid b/manifest.uuid
index 6d1479701bc15c283b0fc369945df481717cc621..bdc8c699728b651037174cd7e2f21c601b8b438c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d4813a8d813f234e819f8ebefbd3ff96d3d69593cc7d716cf0ad6c1a126da827
\ No newline at end of file
+40d10e7aad5b899206e45d1f8606470a90a07049e15d94c3811cfe695f3a402e
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index e0a03d956f6e6430ee84714957199cde2f08d347..b7be52dc2f4a3484cd45133bd39183aa0cdd9d64 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -594,7 +594,7 @@ static void codeVectorCompare(
   int addrDone = sqlite3VdbeMakeLabel(pParse);
   int isCommuted = ExprHasProperty(pExpr,EP_Commuted);
 
-  if( pParse->nErr ) return;
+  if( NEVER(pParse->nErr) ) return;
   if( nLeft!=sqlite3ExprVectorSize(pRight) ){
     sqlite3ErrorMsg(pParse, "row value misused");
     return;