Fix an assert() failure that could be triggered by a correlated sub-query in a RETURN...

FossilOrigin-Name: 551260c8625828262809b1ef7acf5343a3527b7e167ca0cfd13b81e5ece0e66c

diff --git a/manifest b/manifest
index a94847ab60e35469fda816ec208b34c16812bc1b..2caaa19625dc326586937db055e6e0b3b58b3ced 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sprocessing\sof\simplied\sLIMIT\sclauses\swhen\sflattening\sa\scompound\nquery.
-D 2021-03-05T14:08:45.691
+C Fix\san\sassert()\sfailure\sthat\scould\sbe\striggered\sby\sa\scorrelated\ssub-query\sin\sa\sRETURNING\sclause.
+D 2021-03-05T15:10:33.844
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -540,7 +540,7 @@ F src/pragma.h 8dc78ab7e9ec6ce3ded8332810a2066f1ef6267e2e03cd7356ee00276125c6cf
 F src/prepare.c f634a9e799a6b1c136d8ee12479cffa22862bfb807d307b1db406aa0cdb042a5
 F src/printf.c 2b03a80d7c11bb422115dca175a18bf430e9c9dbaa0eee63b758f0c022f8f34f
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
-F src/resolve.c da978d6fdfc9648dda88366e92467a2061945ae42dd102ecd977b04458365abe
+F src/resolve.c dcf55511b1cab1bf13902a6b982281716159171830681976ab294329ac6370e9
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 297724a06fb8ecfcebae72f80c4d0f579bd28d428e011a61a75be366da644323
 F src/shell.c.in af18a2e980aabe739a8188266464866fe7947b100674e07480e7ba3e37595947
@@ -1909,7 +1909,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 23459071091248e94202e609bb8031c3e34722b8ae8ff5a66851dcc528a2d2c2
-R c1d662d56306e63f65ed27b58c3ee657
-U drh
-Z 4f52a223c05cef0d5932b9c09c091c51
+P 90c6b9fcb0e15e2552fe5be53f8201f145bb535cc37b603d488eadf33438412b
+R 49752ff738d93adb39915eb6faab4334
+T *branch * returning-fix
+T *sym-returning-fix *
+T -sym-trunk *
+U dan
+Z 56c14ab2d57d092ff7169a5b82a04754

diff --git a/manifest.uuid b/manifest.uuid
index 765a206214a6fb6f303a21d3b7e5fd624d6d5376..4da52a810a0fc4386f3673e8c0c929ca35cbe38b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-90c6b9fcb0e15e2552fe5be53f8201f145bb535cc37b603d488eadf33438412b
\ No newline at end of file
+551260c8625828262809b1ef7acf5343a3527b7e167ca0cfd13b81e5ece0e66c
\ No newline at end of file

diff --git a/src/resolve.c b/src/resolve.c
index 6853965985988fc805013b5cc18009fec9d6eea9..c60c2f9318b19247c836a82dd701cc109ba1d0e9 100644 (file)
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -417,6 +417,7 @@ static int lookupName(
         }
         if( iCol<pTab->nCol ){
           cnt++;
+          pMatch = 0;
 #ifndef SQLITE_OMIT_UPSERT
           if( pExpr->iTable==EXCLUDED_TABLE_NUMBER ){
             testcase( iCol==(-1) );