Fix a faulty assert() inside sqlite3ExprDup().

FossilOrigin-Name: 59812e7ef705226c801f95ec7f78cc931f9957ffb66715607d63874813b280cb

diff --git a/manifest b/manifest
index 61363cbf8f0ab4acec0a5a2b716a74c43ad67353..6d79037b7bdaa98868a52646992712d4dd8930bd 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sassert()\sin\sOP_ParseSchema\sso\sthat\sit\sworks\seven\safter\san\sOOM.
-D 2021-04-12T22:39:46.559
+C Fix\sa\sfaulty\sassert()\sinside\ssqlite3ExprDup().
+D 2021-04-12T23:18:18.464
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -494,7 +494,7 @@ F src/date.c e0632f335952b32401482d099321bbf12716b29d6e72836b53ae49683ebae4bf
 F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
 F src/dbstat.c 3aa79fc3aed7ce906e4ea6c10e85d657299e304f6049861fe300053ac57de36c
 F src/delete.c 73f57a9a183532c344a3135cf8f2a5589376e39183e0b5f562d6b61b2af0f4d8
-F src/expr.c 4fd60d0e74795f0d083535000e2149241715e8ca3bb4a8f8ecb100427abf8eea
+F src/expr.c 818ede599e69358e62c99cfec498b76a31780cf9b8a262d08dc2625d71ef11d1
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c e9063648396c58778f77583a678342fe4a9bc82436bf23c5f9f444f2df0fdaa4
 F src/func.c 479f6929be027eb0210cbdde9d3529c012facf082d64a6b854a9415940761e5e
@@ -1912,7 +1912,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 1cfcd9dceb56b5987e6900a36a0ec092f0e1b13a7e754b8c3d8efb943e5bcc66
-R 9796ff13f341cbbd883bfba0b029e229
+P 79b883537910274518cadbda7b5088811f59287b9385fc28ab54d837d41b995a
+R ce35e0dc6c3e4fcedd0f6901688d0ba8
 U drh
-Z 75ac750988d1ea436d9d4ea3f83a69d5
+Z 9a3b39088d3d1f8f04556da71936b8ab

diff --git a/manifest.uuid b/manifest.uuid
index 2a15387d36f60867163aa629ebe24948694708c1..fc2b83ac805012482c7201e7816224e3577a24bc 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-79b883537910274518cadbda7b5088811f59287b9385fc28ab54d837d41b995a
\ No newline at end of file
+59812e7ef705226c801f95ec7f78cc931f9957ffb66715607d63874813b280cb
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 4d7258959e8267cb35a2b2d2f4fa8524851f13ca..acc144beab4b120d051786713ce33f9d2ce886b7 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -1402,7 +1402,8 @@ static Expr *exprDup(sqlite3 *db, Expr *p, int dupFlags, u8 **pzBuffer){
         if( pNew->op==TK_SELECT_COLUMN ){
           pNew->pLeft = p->pLeft;
           assert( p->iColumn==0 || p->pRight==0 );
-          assert( p->pRight==0  || p->pRight==p->pLeft );
+          assert( p->pRight==0  || p->pRight==p->pLeft
+                                || ExprHasProperty(p->pLeft, EP_Subquery) );
         }else{
           pNew->pLeft = sqlite3ExprDup(db, p->pLeft, 0);
         }