Fix a crash. Not all tests pass, but tests do at least run to completion now.

FossilOrigin-Name: b5d38e28c62dbc4f5f0e1b2590c9d6c2de9a140cc3528cae1968fd741e337fb0

diff --git a/manifest b/manifest
index 3e5c8bb1a88a7e06aacffd09e35860cd6e7b9657..9c93d8429633d1cdbe6af34ddaf8e541fe17a8b5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
 B 7a876209a678a34c198b54ceef9e3c041f128a14dc73357f6a57cadadaa6cf7b
-C Fix\san\sobsolete\sassert().
-D 2020-07-14T01:51:53.828
+C Fix\sa\scrash.\s\sNot\sall\stests\spass,\sbut\stests\sdo\sat\sleast\srun\sto\scompletion\snow.
+D 2020-07-14T02:03:35.734
 F Makefile.in 19374a5db06c3199ec1bab71ab74a103d8abf21053c05e9389255dc58083f806
 F Makefile.msc 48f5a3fc32672c09ad73795749f6253e406a31526935fbbffd8f021108d54574
 F autoconf/Makefile.am a8d1d24affe52ebf8d7ddcf91aa973fa0316618ab95bb68c87cabf8faf527dc8
@@ -31,7 +31,7 @@ F src/update.c 6a0484134635f167594d597a33d186051125d3ef41803a90b246cea6cf7f11f9
 F src/util.c c0bacc165f46169d2b720c37c8719165e383211698fad1de39dd16a8c161815a
 F src/vdbe.c 981666c49d33039df6dc9fccd40191575586ac4866255b2f57819cc5eb99f572
 F src/vdbeapi.c c1a9004ac554d8d48794d2ce5f80397f8e419fd28643a543cc1e004c7713c3ef
-F src/where.c 101a366c2bea8a92780e65fe8e6d7946bfb450fba3151815e8685e6f9434102e
+F src/where.c 63d8cdbfc31ad06cfa4425dd315188b99e08fcb6830831591387b386b8bc8368
 F src/window.c 0dec178bfa541c757d15a2be78f34aea36393a0966600366810e5f8739ccf370
 F test/altertab.test b8b2104212e8ea87c75c3cbe3cb78ed7236a6c828ee2e59ed09d3dbe9812d002
 F test/busy2.test 415364312743992641f9bf679c84918327296067f85a5d00012b339dc35acbd7
@@ -52,7 +52,7 @@ F tool/mksqlite3c.tcl f4ef476510eca4124c874a72029f1e01bc54a896b1724e8f9eef0d8bfa
 F tool/mksqlite3h.tcl 1f5e4a1dbbbc43c83cc6e74fe32c6c620502240b66c7c0f33a51378e78fc4edf
 F tool/showlocks.c 9cc5e66d4ebbf2d194f39db2527ece92077e86ae627ddd233ee48e16e8142564
 F tool/speed-check.sh 615cbdf50f1409ef3bbf9f682e396df80f49d97ed93ed3e61c8e91fae6afde58
-P 6144387238c03b8b33ae98d624f7ffa44a7829d3e0d4a0a01b5528e71ab4f08b
-R 09e6c9be30ecf43ad00b05e365a92997
+P 221e021077e2bbce693a89a16361418ced20f4e8f5a27e8c461648cff663a2c5
+R 03cf3055552c9116f3d2ae51d09e55c1
 U drh
-Z 06ab4065cbe25e9b13e8388937cdaf63
+Z d0e31887101317936a03df831aee09d5

diff --git a/manifest.uuid b/manifest.uuid
index 878314846a1e68396b9d058094c2f6a6b270acbd..6397d042f182f40f7a659d361f3f666a8f897f84 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-221e021077e2bbce693a89a16361418ced20f4e8f5a27e8c461648cff663a2c5
\ No newline at end of file
+b5d38e28c62dbc4f5f0e1b2590c9d6c2de9a140cc3528cae1968fd741e337fb0
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index b716494f2d64dab9e122565142c7769e0b3faeeb..1afbb20992dd534e7815102e108affb4f048d3ad 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -4427,7 +4427,8 @@ static int wherePathSolver(WhereInfo *pWInfo, LogEst nRowEst){
             }
           }
         }
-      }else if( pWInfo->nOBSat==1
+      }else if( nLoop
+            && pWInfo->nOBSat==1
             && (pWInfo->wctrlFlags & (WHERE_ORDERBY_MIN|WHERE_ORDERBY_MAX))!=0
             ){
         pFrom->aLoop[nLoop-1]->wsFlags |= WHERE_ONEROW;