From: dan <dan@noemail.net>
Date: Sat, 20 Aug 2016 15:01:24 +0000 (+0000)
Subject: Fix a segfault that could occur if a query that used a vector comparison contained... 
X-Git-Tag: version-3.15.0~110^2~60
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f358009a93556ba3f2b71de5354168bd65c49452;p=thirdparty%2Fsqlite.git

Fix a segfault that could occur if a query that used a vector comparison contained certain types of syntax errors.

FossilOrigin-Name: 203f07c5e140e74cf91d0c1e20135c21236f0fc1
---

diff --git a/manifest b/manifest
index 04b3482aed..9c5692d524 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improvements\sto\sthe\svector\scomparison\ssplitter\sin\sexprAnalyze().
-D 2016-08-20T12:00:05.657
+C Fix\sa\ssegfault\sthat\scould\soccur\sif\sa\squery\sthat\sused\sa\svector\scomparison\scontained\scertain\stypes\sof\ssyntax\serrors.
+D 2016-08-20T15:01:24.921
 F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@ -338,7 +338,7 @@ F src/ctime.c e77f3dc297b4b65c96da78b4ae4272fdfae863d7
 F src/date.c 95c9a8d00767e7221a8e9a31f4e913fc8029bf6b
 F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
 F src/delete.c 76c084f0265f4a3cd1ecf17eee112a94f1ccbc05
-F src/expr.c d5cffb307d4e812c41a6fb1f6bc94e6b0801e3e8
+F src/expr.c f1d9c4374246955b9a93edddfc3abfd3297d1455
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c e2be0968c1adc679c87e467aa5b4f167588f38a8
 F src/func.c 29cc9acb170ec1387b9f63eb52cd85f8de96c771
@@ -1022,7 +1022,7 @@ F test/rowid.test 5b7509f384f4f6fae1af3c8c104c8ca299fea18d
 F test/rowvalue.test 56b34d31d91340a6e922e753b798880170cc1aa7
 F test/rowvalue2.test 875068299fd4dd50ef0a47786462c8e1f4065f9a
 F test/rowvalue3.test dbe935260851b197dfbbbcb0ac2a15cb5f324fd4
-F test/rowvalue4.test ed3f7974099f0fc508c9f95df55d37c49f43be65
+F test/rowvalue4.test 318cdd40e66dfae686537eea581ae49cbb01195d
 F test/rowvalue5.test 01c7e0bc4048f30b58e6eb27ecd26e5bd312635e
 F test/rowvalue6.test d19b54feb604d5601f8614b15e214e0774c01087
 F test/rowvalue7.test 3c9a127954d3da309a271babdfc43dbcc5c4da7f
@@ -1519,7 +1519,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 4165d20f64d778a4e48f511a37cfced8579d4dbe
-R 29e91d5826d73f7831f4580f57f08037
-U drh
-Z 96272366ac5b1657f908e6772496984c
+P a3ffd283bc931b04170ef737e56bced33d27f06d
+R b7a3d3965778241daed9250312140835
+U dan
+Z 9e9f2920cf64cc9378d276416e2ee3f8
diff --git a/manifest.uuid b/manifest.uuid
index 72cde1cebc..6e35ee275b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a3ffd283bc931b04170ef737e56bced33d27f06d
\ No newline at end of file
+203f07c5e140e74cf91d0c1e20135c21236f0fc1
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index 5a5afe5ff3..0412919a24 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -462,8 +462,8 @@ static int exprVectorRegister(
   int *pRegFree                   /* OUT: Temp register to free */
 ){
   assert( pVector->op==TK_VECTOR || pVector->op==TK_SELECT );
-  assert( (pVector->op==TK_VECTOR)==(regSelect==0) );
-  if( regSelect ){
+  assert( pParse->nErr || (pVector->op==TK_VECTOR)==(regSelect==0) );
+  if( pVector->op==TK_SELECT ){
     *ppExpr = pVector->x.pSelect->pEList->a[iField].pExpr;
      return regSelect+iField;
   }
diff --git a/test/rowvalue4.test b/test/rowvalue4.test
index 55401aa8a3..c4581d5562 100644
--- a/test/rowvalue4.test
+++ b/test/rowvalue4.test
@@ -292,5 +292,21 @@ do_catchsql_test 7.4 {
   SELECT * FROM f1 WHERE (?, ? COLLATE nose) > (a, b);
 } {1 {no such collation sequence: nose}}
 
+#-------------------------------------------------------------------------
+drop_all_tables
+do_execsql_test 8.1 {
+  CREATE TABLE c1(x, y);
+  CREATE TABLE c2(a, b, c);
+  CREATE INDEX c2ab ON c2(a, b);
+  CREATE INDEX c2c ON c2(c);
+
+  CREATE TABLE c3(d);
+}
+do_catchsql_test 8.2 {
+  SELECT * FROM c2 CROSS JOIN c3 WHERE 
+    ( (a, b) == (SELECT x, y FROM c1) AND c3.d = c ) OR
+    ( c == (SELECT x, y FROM c1) AND c3.d = c )
+} {1 {sub-select returns 2 columns - expected 1}}
+
 finish_test