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
zcmZWn%}-QU6u<A?aR#R-Dj;84pAT@}gAqjQCrCTRr+_oVr!X-1!SF*-xrmh-CTUQs
z$97{<Qj^=5XxfE;fN2z1C~b4y;KoH4Zki_Tx{*~^O{RAS4H{40JNLZbIp@CfJLg>g
zVUAzd?{^i&He(f6*s2t0(<grlG}q2{`qtR2&KbJ_f<Z6|oZus@A@~UaLLOl)AxQX$
zkWW}gSWhS*Y#?kTY$6mAiU`Go&4dy{DWQx|PN*PkA#5dlOxQ-S2-^uZp^{KVs3z<n
zga{77CDagV31PxcLLH%=u#3<@*iG0&_=K>Ru#d2xaDZ@-aEQ=IXd)aYG!s50d`5^6
zJ}0ygju1S;QNl4oE1`|hPB>185@Linp@Yy#=pu9zdI-IQ6NElOKOsRFAPf?cgdxI7
z!YRUO!WqIaAw?J==w6Ky&JxZM#t7#L7YG+0V>}=Vh3@sFx~TOf)uHv6I`++s7@wOF
z;&xqW&{$^tE}t-8n)l5+<}EXA4w_M8d2Zu)(eK94fI8-5H}?0p^|o3gR;0)2i$qU&
zJ<cxI?eU^sOK)YyI@;Y4)6Vvewz#tb+Ma!WLdV#4*7p{)J=g7T^}0RVj>M1H_FVLV
zm@nIr$3o1Au|L=gw!rSPNfy<>`(mpOd2e1+8F9HdFDi|g{5yL@Wne*6T|3TMb*{is
zM}#NC=>paM9^$5jYSS!Eudr~2T}{M#%cQ||gDX{AHSbcf-jr>@YKvRW?p#u8CE~4X
zPxhh`xUQAsWu+`l%t|!|9~Y|DxvmBAv)Qyov*Hi=I8X6D-p1>BH81A{e2w|1*<&`D
zVbeA@7#ZWKF>8ElTr(z&h_TBE8RhIRwjej=8)?2nU6gm83dgu0pF9=&o%5Vk%>37A
zyk2hft1-?BzhZ2?I>%XMIupyhks5VY7C#f=s!@$khvJbc*Xnk5PWu&f#??&BuST*)
z?5e9$a`c&~HHPKvGZAS%qZ8mwMOs>S+Frh0pib*<t^)aXK%L^Ocqo_*u2UyD+ddSG
z#3RvxK`&UOhUA7tQL;AaV_z31yS*0KuqZCbdyAsfKgd}u+4%kCky80`QRH14(3d2w
zL)-IIg0qsu)gKQA^HhJ<4E45p0oAAdiI5j6Q71Utn+Vm{$alrcxIxvcTaoqXkF~0Y
zv$8}e<W*M&RCg}fYTl>1IJ=S?{G(ClpYWu9rqX&%rsVXz*p^JFPQ4j>a{<#IZbsNj
zJE`~9W%mc`GOdH&%zyZBLv91~*%*BCi@5Fc3m?1H^_%=viHPicSmc)vl&H@tSJplk
zWQ@-}dM+Ga<(InP?CAVzN{>YwdFqPp#lNpIuQGeo7o3ULa$-qrmYbGDg>hNdEr|oh
jq&&AI+WnVww~gFCYUIcZaZr}O5M}-eAG^7A6}|sIZY00_

delta 1072
zcmY*WTTGlq6rTT|?JlfbEZ0)3EU>V<T&uOTbQN6bwhLvsmBPXTE$~q;Wq?{kN@56V
zznV1BXlydRw9yCOHBDVi0IQiMh9*W|OdsomPkpF~N#lcN{kJhePcr9x^PQYC=X|sA
zX-aN5=cDrC3L(m`h&{`5pi6)5X{-OZ&$X{YH2F8)0bvm~Aqf|;k8l$nB8$i-yu@=v
z4v|ab5&6XP#D1cHC?txAVxoj7B@Pf}#6hB*c!4-Xyhv0KKBAJSBB}{LQA5-c0U}6*
zh&rO4XdoJiCZd@*OuR(AOdKIzA&wF)#4+MH(Mp^k!o;h@YeXB-PP|S;h&PB1;v^9z
zP7$Yx7|}^|5od^QB2M%Wy+j|;PYe)ei9zBVF+>a#31Wm8C6dG#F-}Yn=ZOo%Br!!y
z6OL9h#6@D3m?P$i1>(|OEP7Pof}{0{nREQI8F2iZIraX!T1>4gb-k%L+wK<frd+ar
zvTxZR*w^eed(_rHo6t<kw^;O}mFm8&Hp|9yM5VCeR@e$zF7Zfg2`whXpoodElPEO<
zQXEYLn(Op`&6f^&O}`Z7nT&JEHhof*B?5tHO|{4LN>Q8$_}W@bk6!*(wa6+H*L9o9
zZ*}Y5O;v53(N{8|OKXR$?UbTsxN|V(n+d9hm4>x^6Z;<%TDx0lPN(|6QFrXaCDsig
zpUTJbk^Dt|Dg83n{@eb;{?%FXLwm{|vHR?HyTG=rKdr~s9qUGFe~vX|$yzg~x3*N!
zn$^E;sbj&5&g|=dg{>#QhuvmIio&;r$TN_ldMzDK|7&$-TA$oj4gM*IzZ&R?_(Q&d
zVB=M{nRF^v({Z=CkOA@4kU6h!ZmW80Lf_j~k+yNC0MWN19kIr$XiinW8FMz;BXX)d
zCh3SY=1qEY&8QTWW8O$lq<dsE>Mb%Ox_w8LW+z<Y-Qwgxv_ntssCoUvjw*8xOA$|o
zKe;@8K&N+9R&dB^lJuRZ%rfVsC{3(>*6PhNgBchYj72@>?6aSU2EM+huDjd|E^)2@
zd;OhJ5#9Gikz3z3syX9Ay8gbRHJ|$Gz6!dk-*l=n61dG}XFUgGnH8t!(}(GY=_6)Y
z3iU)U?Wz)8u&c_gCEc{Ej$2C4?y4^LqBFJi?2S4-{Xn(qgAbg!FS*2fhxXW8{{WMM
BZ^Qrq