From: drh <>
Date: Mon, 13 Sep 2021 18:16:15 +0000 (+0000)
Subject: Add assert() statements to refute
X-Git-Tag: version-3.37.0~245
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82456a661d6f8ccde40c9bc685d3d67c303fbed9;p=thirdparty%2Fsqlite.git

Add assert() statements to refute
[forum:/forumpost/9f4e7f58fbb66ddd|forum post 9f4e7f58fbb66ddd].

FossilOrigin-Name: 83a83475c5064ea62016a03e9173ecd2a1fec7f6296f1ee99896fa0a38b4196a
---

diff --git a/manifest b/manifest
index 5fe7aa9ace..58efd916f7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\snew\stest\sfile\srtreedoc.test.
-D 2021-09-13T16:36:20.763
+C Add\sassert()\sstatements\sto\srefute\s\n[forum:/forumpost/9f4e7f58fbb66ddd|forum\spost\s9f4e7f58fbb66ddd].
+D 2021-09-13T18:16:15.976
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -545,7 +545,7 @@ F src/printf.c 78fabb49b9ac9a12dd1c89d744abdc9b67fd3205e62967e158f78b965a29ec4b
 F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 F src/resolve.c 42b94d37a54200707a95566eff4f7e8a380e32d080016b699f23bd79a73a5028
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c b2c48dfc02b486fd2da2be1605503615958ba1997d40d994c2946975d0150a31
+F src/select.c 030c3d07326708343208418c84da607752aebc13c92df929b7c68c7c08e7df54
 F src/shell.c.in 2c063d07127aa59e45806ae7911fa6963664901f9fdccfba71b926195d34be36
 F src/sqlite.h.in 4e977a5e2ed1a9e8987ff65a2cab5f99a4298ebf040ea5ff636e1753339ff45a
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -636,7 +636,7 @@ F src/where.c da3981a12e9eb5a71d32bab60ac1957fd4aa337aaea07ca8019b01f8788f442a
 F src/whereInt.h 9248161dd004f625ce5d3841ca9b99fed3fc8d61522cf76340fc5217dbe1375b
 F src/wherecode.c 0208553a0602146b5640747c0e3f7a8c785108c2d06a160b69f23491e9dc781e
 F src/whereexpr.c e5fdac355deef93a821f03b90770f92f2be833e92bbdeff8ac1b6c2ae1f74356
-F src/window.c 420167512050a0dfc0f0115b9f0c7d299da9759c9bb2ae83a61fb8d730a5707f
+F src/window.c a5417de85a13e1f47bfb33c0bae5ae0ded5d68b146f4986c3d89d10a04f2c262
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
 F test/affinity3.test eecb0dabee4b7765a8465439d5e99429279ffba23ca74a7eae270a452799f9e7
@@ -1923,7 +1923,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 f4a552ed9f4ab35520b634954c39748cc7bda535f426280b79da1b99f70599ac
-R f99597bfa8634077950c96867f36ea09
-U dan
-Z 062a262734dac9852988b18115d599fe
+P 8c4b1482eeb31856bce20eda1ce74959e19da11962f74d406a608747a92fe429
+R 31122d38ddbc232dcbd8f2a1a089a76e
+U drh
+Z 2f8fa553907508fe78dd100f7c6194fd
diff --git a/manifest.uuid b/manifest.uuid
index ed943b18a2..530c60dd86 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8c4b1482eeb31856bce20eda1ce74959e19da11962f74d406a608747a92fe429
\ No newline at end of file
+83a83475c5064ea62016a03e9173ecd2a1fec7f6296f1ee99896fa0a38b4196a
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index 78e5f5cf09..ba82d624d0 100644
--- a/src/select.c
+++ b/src/select.c
@@ -347,6 +347,9 @@ static void addWhereTerm(
   pE2 = sqlite3CreateColumnExpr(db, pSrc, iRight, iColRight);
 
   pEq = sqlite3PExpr(pParse, TK_EQ, pE1, pE2);
+  assert( pE2!=0 || pEq==0 );  /* Due to db->mallocFailed test
+                               ** in sqlite3DbMallocRawNN() called from
+                               ** sqlite3PExpr(). */
   if( pEq && isOuterJoin ){
     ExprSetProperty(pEq, EP_FromJoin);
     assert( !ExprHasProperty(pEq, EP_TokenOnly|EP_Reduced) );
diff --git a/src/window.c b/src/window.c
index 4a05392ad8..423ad2db8a 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1066,6 +1066,9 @@ int sqlite3WindowRewrite(Parse *pParse, Select *p){
        ("New window-function subquery in FROM clause of (%u/%p)\n",
        p->selId, p));
     p->pSrc = sqlite3SrcListAppend(pParse, 0, 0, 0);
+    assert( pSub!=0 || p->pSrc==0 ); /* Due to db->mallocFailed test inside
+                                     ** of sqlite3DbMallocRawNN() called from
+                                     ** sqlite3SrcListAppend() */
     if( p->pSrc ){
       Table *pTab2;
       p->pSrc->a[0].pSelect = pSub;