From: drh <>
Date: Wed, 3 Aug 2022 16:04:12 +0000 (+0000)
Subject: For an IN operator used with a RIGHT JOIN, use the number of terms in the
X-Git-Tag: version-3.39.3~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7dde866d3b02ee129d8c68757d1f4bf60e5e559b;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: 003e4eee6b53a4dee3b8593dc052661d56bd426c8fc184b8a6b5e760a7f9e003
---

diff --git a/manifest b/manifest
index a7ea154f4d..d00a500fd3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Bump\sthe\sversion\snumber\sup\sto\s3.39.3.
-D 2022-08-01T13:17:41.708
+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-03T16:04:12.587
 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 e7b7c9d37f4f8d14d4d05b20e57ae43712a51ffed7d45f547a23f9c42ee483dd
 F src/whereInt.h b48ca529ffe293c18cbfa8326af18a09e39910de66fb3e96ef788c7cbf8ef3a7
-F src/wherecode.c 0b09abfcb88c61c6a6984a3e065786631ff35495e9bdf865e6b74ab0a1299c5b
+F src/wherecode.c 3bda24668f9b8401bac0cc71eae8eebd51964dffa0bb58bf11907b3207758660
 F src/whereexpr.c 55a39f42aaf982574fbf52906371a84cceed98a994422198dfd03db4fce4cc46
 F src/window.c fff1b51757438c664e471d5184634e48dcdf8ea34b640f3b1b0810b1e06de18c
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@ -1978,8 +1978,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P a8ae721617e75742966cbc77bf56a264e36b7278cb718eb155d72b579c95d5cd
-R 5a2813ad87c1524ee277ad228f6f2fe9
+P d0f7f22a8f4e74d344d9ac7b5bd5a3905179ab1954c8351b0aac912c410a6767
+Q +b184c8d9222da6b420b5d7c439bbe4b737d92ffa27f5e933f4e1a9c8117b0ee5
+R 19429322187b539dad3968d514ffa048
 U drh
-Z b2a34eafb813e758f5e9a4093063acac
+Z 1982578c75ea1044baa744e66cf78adb
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index aa4f5cd62b..ab508cf9c1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d0f7f22a8f4e74d344d9ac7b5bd5a3905179ab1954c8351b0aac912c410a6767
\ No newline at end of file
+003e4eee6b53a4dee3b8593dc052661d56bd426c8fc184b8a6b5e760a7f9e003
\ No newline at end of file
diff --git a/src/wherecode.c b/src/wherecode.c
index 04f1c374d0..253a0991d3 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;