From: drh <>
Date: Wed, 3 Aug 2022 15:58:44 +0000 (+0000)
Subject: For an IN operator used with a RIGHT JOIN, use the number of terms in the
X-Git-Tag: version-3.40.0~264
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5a6f33e50224acba83da2cd446ae331736841a1;p=thirdparty%2Fsqlite.git

For an IN operator used with a RIGHT JOIN, use the number of terms in the
vector, not the number of equality terms, to size the column map.
dbsqlfuzz 14cfdad6ca45e607163f54049ddf5065183dc657.

FossilOrigin-Name: b184c8d9222da6b420b5d7c439bbe4b737d92ffa27f5e933f4e1a9c8117b0ee5
---

diff --git a/manifest b/manifest
index c3727e9837..f3994472d9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sthe\sxUpdate\smethod\sof\sthe\sGeoPoly\svirtual\stable,\smake\ssure\sthat\sthe\nnumber\sof\supdated\scolumns\sdoes\snot\sexceed\sthe\sunderlying\simplementation,\seven\nif\sthe\svirtual\stable\sobject\srecords\san\sexcess\snumber\sof\scolumn\sin\sthe\snAux\nfield\sdue\sto\stable\sconstraints\sin\sthe\stable\sdefinition.\nFix\sfor\sthe\sproblem\sreported\sby\n[forum:/forumpost/a096ab7d96bb057a|forum\spost\sa096ab7d96bb057a].
-D 2022-08-01T13:14:03.301
+C For\san\sIN\soperator\sused\swith\sa\sRIGHT\sJOIN,\suse\sthe\snumber\sof\sterms\sin\sthe\nvector,\snot\sthe\snumber\sof\sequality\sterms,\sto\ssize\sthe\scolumn\smap.\ndbsqlfuzz\s14cfdad6ca45e607163f54049ddf5065183dc657.
+D 2022-08-03T15:58:44.012
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -659,7 +659,7 @@ F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
 F src/where.c 1049685e84bd74692ad76984a3411a21c5a1e6ddd08c981ec94d2f11f769e07f
 F src/whereInt.h b48ca529ffe293c18cbfa8326af18a09e39910de66fb3e96ef788c7cbf8ef3a7
-F src/wherecode.c 210240c9cec2a1d1494a3ac7852e9432245382e752b490c2bb437637c2c98711
+F src/wherecode.c 6fc48e5b25821c66c387a2e5b2d00bf497636ed330683ce5acae50b178d25bac
 F src/whereexpr.c 55a39f42aaf982574fbf52906371a84cceed98a994422198dfd03db4fce4cc46
 F src/window.c 928e215840e2f2d9a2746e018c9643ef42c66c4ab6630ef0df7fa388fa145e86
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@ -1981,8 +1981,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 01de7ec44fb1e8e6f847eaef433216b3163a44a8789451718e1c419ef840ddfb
-R 6e9af4a1fd48ba4a0b2f74feb2fb7ec8
+P a04dd475c2c8afdded0afecfd34c6c4c2f48cce520e09b7fa5172ff30f09209e
+R 63dd5d94fb138ca07714f601c94938cf
 U drh
-Z b4532202f959fae679f2c4c7df6a9a48
+Z 4f99307534c0bc9f7c784d197ef60b08
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index db1cc4977c..d44341365c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a04dd475c2c8afdded0afecfd34c6c4c2f48cce520e09b7fa5172ff30f09209e
\ No newline at end of file
+b184c8d9222da6b420b5d7c439bbe4b737d92ffa27f5e933f4e1a9c8117b0ee5
\ No newline at end of file
diff --git a/src/wherecode.c b/src/wherecode.c
index db7c60ec2a..ab947773b7 100644
--- a/src/wherecode.c
+++ b/src/wherecode.c
@@ -622,7 +622,8 @@ static int codeEqualityTerm(
         }
         sqlite3ExprDelete(db, pX);
       }else{
-        aiMap = (int*)sqlite3DbMallocZero(pParse->db, sizeof(int)*nEq);
+        aiMap = (int*)sqlite3DbMallocZero(pParse->db,
+                             sizeof(int)*sqlite3ExprVectorSize(pX->pLeft));
         eType = sqlite3FindInIndex(pParse, pX, IN_INDEX_LOOP, 0, aiMap, &iTab);
       }
       pX = pExpr;