From 1fd4e7bb0c24dd90ff0362e46a8ad0095f6c0e83 Mon Sep 17 00:00:00 2001
From: drh <drh@noemail.net>
Date: Sat, 28 Jul 2018 14:56:56 +0000
Subject: [PATCH] Fix an assert() statement that was made obsolete by the
 constant propagation enhancement.  Problem discovered by OSSFuzz.

FossilOrigin-Name: e4b4737e348235e196a45e1b71876b82e0cc836e1c5c16ea5f9333b7509b59b8
---
 manifest          |  14 +++++++-------
 manifest.uuid     |   2 +-
 src/select.c      |   2 +-
 test/fuzzdata5.db | Bin 7195648 -> 7195648 bytes
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 39fd0dc3a0..681f20afee 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\sdebugging\soutput\swhen\sthe\s".selecttrace"\soption\sis\sused\sin\sthe\sshell.
-D 2018-07-28T14:34:22.343
+C Fix\san\sassert()\sstatement\sthat\swas\smade\sobsolete\sby\sthe\sconstant\npropagation\senhancement.\s\sProblem\sdiscovered\sby\sOSSFuzz.
+D 2018-07-28T14:56:56.784
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 0a3a6c81e6fcb969ff9106e882f0a08547014ba463cb6beca4c4efaecc924ee6
@@ -498,7 +498,7 @@ F src/printf.c 7f6f3cba8e0c49c19e30a1ff4e9aeda6e06814dcbad4b664a69e1b6cb6e7e365
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 797088662ed61102485e3070ba3b3f7828bd5ef6a588223ba6865d77d52f6cea
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
-F src/select.c a7c1a827d9bb23334b9bfe7e5c103b1398371f10796154a69023e0946fb3b0d9
+F src/select.c 22ed163cf65258a1101685228bb67d85b60b2965fec344f5c56d185f46fc62f2
 F src/shell.c.in f6ebd05c461805a7c708333cd645e74e0a93560d2118f5adb73a75d8c9cf6b01
 F src/sqlite.h.in c6451bb876adced3aba5b1682c6317d215c5eceaba21a6ce979e71a0b8d0bf95
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -954,7 +954,7 @@ F test/fuzzdata1.db 7ee3227bad0e7ccdeb08a9e6822916777073c664
 F test/fuzzdata2.db f03a420d3b822cc82e4f894ca957618fbe9c4973
 F test/fuzzdata3.db c6586d3e3cef0fbc18108f9bb649aa77bfc38aba
 F test/fuzzdata4.db 1882f0055fb63214d8407ddc7aca9b0b1c59af21
-F test/fuzzdata5.db 117d821cde02e30a687f6361a34b98e6e0b05062df523cfee163c58564403b68
+F test/fuzzdata5.db e60076888dd070ac3cd39b46c566176173c392042622ced6f7df465bd6c84887
 F test/fuzzdata6.db 92a80e4afc172c24f662a10a612d188fb272de4a9bd19e017927c95f737de6d7
 F test/fuzzer1.test 3d4c4b7e547aba5e5511a2991e3e3d07166cfbb8
 F test/fuzzer2.test a85ef814ce071293bce1ad8dffa217cbbaad4c14
@@ -1753,7 +1753,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 02204f8b246c868846f39bd44f2e3bc0fab0275aa09ef3a0e5a8e3d58f484ca8
-R 7a41e2fa4afa4ef4cbf53d2695995d58
+P fcb88dd6b0f248f600c1158907889f6d5fa2c96eb4585221941da4673c6db6eb
+R 4bd85098ffd81dad632d50502c6e83b7
 U drh
-Z 25d0f8749ae2cbe0cb0dae376846dc8c
+Z 583b66bbd6725fdec089b65fdf480429
diff --git a/manifest.uuid b/manifest.uuid
index c76ea83874..818fe6611e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fcb88dd6b0f248f600c1158907889f6d5fa2c96eb4585221941da4673c6db6eb
\ No newline at end of file
+e4b4737e348235e196a45e1b71876b82e0cc836e1c5c16ea5f9333b7509b59b8
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index 0b8462b3d8..521e3b4a96 100644
--- a/src/select.c
+++ b/src/select.c
@@ -3450,7 +3450,7 @@ static Expr *substExpr(
       Expr *pCopy = pSubst->pEList->a[pExpr->iColumn].pExpr;
       Expr ifNullRow;
       assert( pSubst->pEList!=0 && pExpr->iColumn<pSubst->pEList->nExpr );
-      assert( pExpr->pLeft==0 && pExpr->pRight==0 );
+      assert( pExpr->pRight==0 );
       if( sqlite3ExprIsVector(pCopy) ){
         sqlite3VectorErrorMsg(pSubst->pParse, pCopy);
       }else{
diff --git a/test/fuzzdata5.db b/test/fuzzdata5.db
index 55089e1f566ec467506221de1dc2fd1aa6c508a7..2b785fa482075eac23b59c4bc1e5956236b2015b 100644
GIT binary patch
delta 1407
zc-m!B%}-QU6u<AiaR#SYR6xG8J|E!B0|e3fiPBE-Dc}s>!oc7M@Iz6#h?N>9Y5ZvY
z*=|f~YVsNrO}p?9FpUBWrERVo+_>n%P1B@ZH@fPo$@I>kQRB(I=id7}=e&1*=bS4)
z%vo3T{;s0f5u)OPcq0XR2mGHx&9yhX0xKL*ADy@g!XQk-A_Bw;B1nXYJYppgCO#nY
ziB-ghL;<mySVOEO3W*}3m{>=Y5T!&JQBG74>xm7-N5n?LCN>ccQAt!0)x>5ZLPQCd
zs3B^JI${e^Pc#r)iAG`@v7Pvs*g@<hb`iUYJ;Yw3iP%T%Cz^>*h);<a@fp!V93VX6
zAaRIjCEAE~;xG{>5<~~lNpun2L=VwR^btpheqw+~5`)ALks^kPqr@@dIB|j)Ax4QY
zLf2}XI7yr$CWzC-8RF~%Oon8k)U}>gXSF`3I<=lqhrYQaC+99ndA+_gY`hfKEo;hr
zX5KMxnAgm-Ib_C-mvd_-i+(qT2i2i~xVmegt*_M{vtzx{{#g8o*BjmHy1ic9Yw4@Z
z*av$$6WZ9`+13$V1|82iJ*9mdCu@5RI-ctew0b?B<HR}+IL=)BuADF1oF^i}NQghg
zQ?Vd!iD?nnz`Nq8PXG42tTH<M#d%q2B>ca#N8ArB$g0bSEm56Ia6BsOrt8uLs{I|r
zO-t3LSsY(x5gl<g5&JchM%N85CurBaO~rndwhcS`*p>?#UG{iw+MdNq;JS8>mo{r+
z_GnZ1L7{4$>t2vQoBP&lR@Oah(i*k;tv0K{s<z6l0&9i&r`c=nGwV#pTy12GN5)O#
zTjR1ZWyFlFM#Lx=e~ATuO}>$~HmkG#jYl$Sobew%lDnd(Em3jlzb50w%ch{3utedP
zLVT!BS)wwXNn~D0jXLQUKbCb>;~Jlhbi}G$yC=G3HmIN@E@l!zHI}_3F1l*eAAc-s
zjS>ImV;O5cp#$K}#9CUnI9|R}ppNTmz5()`kUD0G;^A;Ayh<Il#HQhJtRog59P+|N
zYS>@BC`(qR0^+OURFBu<H!jLE{_RCs8XU4jBGvT$`LR;}*`mz5Jg7gCviEMvQ%Osd
zBrpEBC!D7Sve!sos~1xJ+MbMfkrH*p5<8NSh8q8Eu`_O1_32V%E&8!i^;)7V8Hsq+
zl_AxW3$~kgs%}eM$Tj}{c=VsTX}xCBdMIZ6*?GA!l~i4NGIrz~X5XKTIy)U5eFxn3
z-nh(ar&s+S+25F(0DU%vAO0e*2ZAynu66(B|Egrn@48nM^zSO!kX5c<`$W>1oV))-
zMgx^!=!CO<3#u927JbQ67j!NDeV%!q*{(jfgnZ#oEy;EM+9g?GocHUO<ZffyKeZ&=
fgXeU$jod$K{IREUk6->&mIbE*;_D4>&^!MFZY00_

delta 1072
zc-mD`TTGlq6rTT|?JlfPEZ0)3EU>V<T&uOT6a`nhEl`$QDYvDxz(={10cs5?i6N-{
zYSKibvB~(-Mjw3FG<7intY(@RnizdCeXI{Y^`RyvjSrf2wlP6Za?YIjPR^P0ojL2D
zCgr--k4g$kg($fqc4e<skN(`(QuA@IXHTi953auh!XaEj5*}g?;U#=T29ZhliRXwc
zBAeJt<Pgsj`-og3kH{wqh(e->*iRG_2Z$2l1>zv_B2h{Nh%%y_s33wwB~e9$h%gZ$
zs)-t+mZ&4@i3Z{j@e=VeahQ08I6^cMM~P!Z6LFkqCSE08BU*@7;&mcQyg{@PCx{qv
zk~l@Q6CFe+ahm8N;zT#mL-Z1TL_cwc7$D9PgTxRqOpFktM1mM2&Jp9pdEx>wK}-@;
zgq_tiagmrIW{Ejsp15=u3qF-MZ)d%1X02T^{npN!lkcyoh2)x2*Xs*1-7X<-%0>4l
z_m=yCd(B;SM_v81iA*O03;91f$*$XKqxf8wC=*WHX?7xxM?4anLW^-RAlgN<4HTJv
zDUJ+>8mjewC6J2vO`jAc>4?2#nqDc2heM%QWrff5NKr5x3bZtuZoTxaYLw+BuB$gx
z(CN}W8>+%Nt*@kyPOU9i)geXYP{%-fU^=X7mupvZO#A<k$m-oZb1K>Qjk@C=Ds*lL
z`BXlZkK`}%OBs~e?%(bo?yr{Qhwh|1;`X|&Zm#P%e>#tyJI;;dzAR_ZkyU0^Z*Hov
zGoydoR7b-XZSQM;H9Jp!Z}ysLDe~U7n`$6M#cC>^`d6yWls>VgYJ-y&zZ&X}1|xy~
zaNSj}nXnlvskql%NIUVBh&iusZmAk)T;JPL(Ux;I0kOBDZS8gCv8?hOGiDj>0$Jrg
zldwY?^C$e-W>ku@F@Ll>+BGs7^XHop-MX!cGKW3l-GW4atW8gBt2zC{wkq}xNfA#p
ze{y+hzfNtdjPRf>k_a3x%P?o9C>mb*tjV8Y2GVY5pgra@XP*5;EcEp~b=~8g_lRqK
z-|O#;it64k^1b@DQ4MJm(KYuKow?*!_f^<a@utm6^Y@y|mY#Jo%(AWd^kM2@>abao
zLOs!oJE~CU?x+%HQP=ONV~)}@JF3&WV7qpny-}^F9;haL;DPP?l1IFEa2LJx50ip#
A!~g&Q

-- 
2.47.3