Fix a crash that could occur when the SELECT in an EXISTS(SELECT ...) used an unknown...

FossilOrigin-Name: f3009a6d7facd1ead520d588c5ad089db76d8641cd3dae076f2405492d7defcd

diff --git a/manifest b/manifest
index 55819af278797b7ab4153ee02fa144b6de830e78..24efae1938585271979195c7c56fde48a528c0bd 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sextra\stests\sfor\sthe\schanges\son\sthis\sbranch.
-D 2024-06-08T18:13:12.691
+C Fix\sa\scrash\sthat\scould\soccur\swhen\sthe\sSELECT\sin\san\sEXISTS(SELECT\s...)\sused\san\sunknown\scollation\ssequence.
+D 2024-06-10T19:31:18.296
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -755,7 +755,7 @@ F src/printf.c 8b250972305e14b365561be5117ed0fd364e4fd58968776df1ce64c6280b90f9
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 9c7786f032dea81487e7d94cb17849936f0e9b8891bfc91a6ac24ab193762804
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
-F src/select.c 06146768a11bfe8928fea0aabf8addedd4d146a8c4be70558f5c8ecdcc2ce338
+F src/select.c b3fa60ba7aab607daf0d15053a66073888f3dd8d6bb1c8000349bc22d85acd80
 F src/shell.c.in 77d12a0dab8724819e64a14d5fbaad91a934be2b22ad329708fba9ba78993f04
 F src/sqlite.h.in cbd3e4177791a61c056fd81e37a5b21bb6c8cb2ea8cac558c625974673f50acf
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1114,7 +1114,7 @@ F test/exclusive.test 7ff63be7503990921838d5c9f77f6e33e68e48ed1a9d48cd28745bf650
 F test/exclusive2.test 984090e8e9d1b331d2e8111daf6e5d61dda0bef7
 F test/exec.test e949714dc127eaa5ecc7d723efec1ec27118fdd7
 F test/exists.test 79a75323c78f02bbe9c251ea502a092f9ef63dac
-F test/existsexpr.test b101143b177d623c35166589d3e6772021dfe4f625ac318c91726a998939cd19
+F test/existsexpr.test 7c0abb8383b492325d57e0546faf4ea52ad52c02877b797460330f17320a1314
 F test/existsfault.test ff41c11f3052c1bbd4f8dd557802310026253d67d7c4e3a180c16d2f0862973e
 F test/expr.test 5c06696478212e5a04e04b043f993373f6f8e5ce5a80f5548a84703b123b6caa
 F test/expr2.test c27327ae9c017a7ff6280123f67aff496f912da74d78c888926d68b46ec75fd8
@@ -2197,8 +2197,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 972a33db0b0e924b78d5309d222d8ea298bd59c72da14ea2d14e8e2caaad1e0a
-R 20ea5e8daae9a69a6e09a05cc19a6a37
+P a6365c778f2a6d6fa78e8520553373898f382ce73bf6496533e26291648ef5d1
+R 4addb7a3e408fa9c0e91b39c04b20512
 U dan
-Z cbb8e2989ade033c119abad0907d9ec3
+Z fa336d8505987cef2cdbba1866644a8f
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index ce5b16061ca91afac032dec73cecb3e38d13cec0..f3378323f6c2e963b442f97da2fe81c9e54c42a0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a6365c778f2a6d6fa78e8520553373898f382ce73bf6496533e26291648ef5d1
\ No newline at end of file
+f3009a6d7facd1ead520d588c5ad089db76d8641cd3dae076f2405492d7defcd
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index f21559e8da5a9b58e667093e2a094ab38fede0d1..ac8b1b6ae013bf38fa98ab3253bbc9f15c3299aa 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -7347,7 +7347,7 @@ static u64 findConstIdxTerms(
           assert( pIdx->azColl[ii] );
           if( pLeft->iColumn==pIdx->aiColumn[ii] ){
             CollSeq *pColl = sqlite3ExprCompareCollSeq(pParse, pWhere);
-            if( sqlite3StrICmp(pColl->zName, pIdx->azColl[ii])==0 ){
+            if( pColl && sqlite3StrICmp(pColl->zName, pIdx->azColl[ii])==0 ){
               m |= ((u64)1 << ii);
               break;
             }

diff --git a/test/existsexpr.test b/test/existsexpr.test
index 344f8cff6eaa25679c8c5f0169952f3f50ed3c5e..836560f2d0e51894683447e326527b25e9b2a0a6 100644 (file)
--- a/test/existsexpr.test
+++ b/test/existsexpr.test
@@ -363,6 +363,18 @@ do_subquery_test 5.7 1 "
   2 5
 }
 
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 6.0 {
+  CREATE TABLE t1(a, b UNIQUE, c UNIQUE);
+  CREATE TABLE t2(a INfEGER PRIMARY KEY, b);
+  CREATE UNIQUE INDEX t2b ON t2(b);
+}
+
+do_catchsql_test 6.1 {
+  SELECT a FROM t1 WHERE EXISTS (SELECT 1 FROM t2 WHERE c COLLATE f = a)
+} {1 {no such collation sequence: f}}
+
 
 
 finish_test