Fix a crash in flattenSubquery(). (CVS 5388)

FossilOrigin-Name: 9c8b97ef593c17740640a01a7338164d7fbe070e

diff --git a/manifest b/manifest
index e3c5c76c399fdcf8605eb864935415f103ca5533..e9f99ee1f5d500be44d413e0a94568daec000566 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sSQLITE_OPEN_NOMUTEX\sflag.\sUsed\sfor\sopening\sconnections\sthat\sare\snot\sprotected\sby\san\sinternal\smutex.\s(CVS\s5387)
-D 2008-07-10T17:52:49
+C Fix\sa\scrash\sin\sflattenSubquery().\s(CVS\s5388)
+D 2008-07-10T17:59:12
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a03f7cb4f7ad50bc53a788c6c544430e81f95de4
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -140,7 +140,7 @@ F src/pragma.c 6fad83fbcc7ec6e76d91fe2805fe972ff3af6a0c
 F src/prepare.c c9bb0aacb7a571d049805699ed18f2bb136ea091
 F src/printf.c 8e5d410220cf8650f502caf71f0de979a3f9031e
 F src/random.c 5c754319d38abdd6acd74601ee0105504adc508a
-F src/select.c 0c887fe1a88ee40a11e71127f4e91a0d864508cd
+F src/select.c fcf51df1818a448edebf55b032d89771ba4536ef
 F src/shell.c 484e7297e066f22830f9c15d7abbcdd2acb097b0
 F src/sqlite.h.in 2fcdb1c1ee337d8371eb43a0c29294562b76ee23
 F src/sqlite3ext.h 1e3887c9bd3ae66cb599e922824b04cd0d0f2c3e
@@ -451,7 +451,7 @@ F test/select7.test 7906735805cfbee4dddc0bed4c14e68d7f5f9c5f
 F test/select8.test 391de11bdd52339c30580dabbbbe97e3e9a3c79d
 F test/select9.test b4007b15396cb7ba2615cab31e1973b572e43210
 F test/selectA.test e4501789a1d0fe9d00db15187623fb5b7031357b
-F test/selectB.test 09ae87083e87e76924fa85206fc69f55f23a9aeb
+F test/selectB.test 4bc893e4cb0f5f43f924dc13a9b76a8b6d134e31
 F test/server1.test f5b790d4c0498179151ca8a7715a65a7802c859c
 F test/shared.test f1066281aa19517ab8dbe76328afadff76516f67
 F test/shared2.test 0ee9de8964d70e451936a48c41cb161d9134ccf4
@@ -600,7 +600,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 636cd723296a8b1709011fdd99b236ffddf3f1b0
-R 1c142d83f8684ccc1bee7d1f443817bd
+P 7e58b78712420b3bd4320192a58d89eb71eecc9c
+R 0939dee77d063e7cffac53f1e1ad55a1
 U danielk1977
-Z 2f8219b821c41fd853a77ecdbb18c26b
+Z a0db231c1a42fdb08eeec046ea7b2e61

diff --git a/manifest.uuid b/manifest.uuid
index 903e05538fbe63a40ee54066cc0397ab0bfbb850..4293c1cce5a6518e8b7596f7376b129b75510be5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7e58b78712420b3bd4320192a58d89eb71eecc9c
\ No newline at end of file
+9c8b97ef593c17740640a01a7338164d7fbe070e
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 8ea021f07ca7ede3e01d8ae1b4292ff95e14e25e..e14e2920df222d15c879d81f702545123751b7f3 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -12,7 +12,7 @@
 ** This file contains C code routines that are called by the parser
 ** to handle SELECT statements in SQLite.
 **
-** $Id: select.c,v 1.453 2008/07/10 00:32:42 drh Exp $
+** $Id: select.c,v 1.454 2008/07/10 17:59:12 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 
@@ -3061,7 +3061,9 @@ static int flattenSubquery(
     }
     for(pSub1=pSub; pSub1; pSub1=pSub1->pPrior){
       if( pSub1->isAgg || pSub1->isDistinct 
-       || (pSub1->pPrior && pSub1->op!=TK_ALL) ){
+       || (pSub1->pPrior && pSub1->op!=TK_ALL) 
+       || !pSub1->pSrc || pSub1->pSrc->nSrc!=1
+      ){
         return 0;
       }
     }

diff --git a/test/selectB.test b/test/selectB.test
index 05a92e6a55cebd46e13d84f3fc27bfd8cbbd99c5..63e7202571c56127de9e482c9f9cd6e52acf8a25 100644 (file)
--- a/test/selectB.test
+++ b/test/selectB.test
@@ -10,7 +10,7 @@
 #***********************************************************************
 # This file implements regression tests for SQLite library. 
 #
-# $Id: selectB.test,v 1.6 2008/07/08 17:43:57 danielk1977 Exp $
+# $Id: selectB.test,v 1.7 2008/07/10 17:59:12 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -363,6 +363,12 @@ for {set ii 3} {$ii <= 4} {incr ii} {
       SELECT * FROM (SELECT * FROM t1 UNION ALL SELECT * FROM t2) ORDER BY a+b
     }
   } {2 4 6 3 6 9 8 10 12 12 15 18 14 16 18 21 24 27}
+
+  do_test selectB-$ii.21 {
+    execsql {
+      SELECT * FROM (SELECT 345 UNION ALL SELECT d FROM t2) ORDER BY 1;
+    }
+  } {3 12 21 345}
 }
 
 finish_test