From: drh <>
Date: Sat, 24 Aug 2024 11:48:19 +0000 (+0000)
Subject: Ensure that the WhereLoop.u.btree.pOrderBy field added by the
X-Git-Tag: version-3.47.0~200
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=27095fc4a5ed21df5023c4fb35ebeef10d7894fc;p=thirdparty%2Fsqlite.git

Ensure that the WhereLoop.u.btree.pOrderBy field added by the
order-by-subquery optimization [7a0cdc7edb704a88] is correctly
initialized.  dbsqlfuzz 437be171a98687082a31ea6efc2fd5c5d64481c8.

FossilOrigin-Name: b75f8b2252aefe7bb96fa237205a1a9dc88c46d9ec09bca7407e6c636b203e7e
---

diff --git a/manifest b/manifest
index 5736796277..3751b90e1b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Eliminate\suse\sof\sstrcpy()\sin\sshell.c.in\sto\ssquelch\san\sunwarranted\slink-time\swarning\son\sOpenBSD.
-D 2024-08-23T21:20:50.763
+C Ensure\sthat\sthe\sWhereLoop.u.btree.pOrderBy\sfield\sadded\sby\sthe\norder-by-subquery\soptimization\s[7a0cdc7edb704a88]\sis\scorrectly\ninitialized.\s\sdbsqlfuzz\s437be171a98687082a31ea6efc2fd5c5d64481c8.
+D 2024-08-24T11:48:19.350
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -850,7 +850,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c 887fc4ca3f020ebb2e376f222069570834ac63bf50111ef0cbf3ae417048ed89
 F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452
 F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014
-F src/where.c 70392f65e2c76a27ab1faed05892c2402ce547e574074a4f10282b3bc1ffe4eb
+F src/where.c c046dd58c3410f7b7528e1e6317cb876398557bad346d568ed8562321a7d002d
 F src/whereInt.h a5d079c346a658b7a6e9e47bb943d021e02fa1e6aed3b964ca112112a4892192
 F src/wherecode.c 5172d647798134e7c92536ddffe7e530c393d79b5dedd648b88faf2646c65baf
 F src/whereexpr.c 44f41ae554c7572e1de1485b3169b233ee04d464b2ee5881687ede3bf07cacfa
@@ -2210,8 +2210,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 9a9d0f6301faefe324261f03543023ffb6a90823349c6946abb0df2f69b31f96
-R 0473ef71b70c85fedef9e64071463927
-U stephan
-Z 10e164d89e2d1a1189bcd188933ef2aa
+P 32e9bf7f972144eacbb2580151220bc4fc1cbcc8bcf586ffd8e10762abf75c7e
+R c767a4091aaf30f3cd810bce15db7a5b
+U drh
+Z 6904df1088a904060173307e81bc10aa
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d54c88a271..b7454fff9f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-32e9bf7f972144eacbb2580151220bc4fc1cbcc8bcf586ffd8e10762abf75c7e
+b75f8b2252aefe7bb96fa237205a1a9dc88c46d9ec09bca7407e6c636b203e7e
diff --git a/src/where.c b/src/where.c
index a82f0305b4..2b835009db 100644
--- a/src/where.c
+++ b/src/where.c
@@ -3987,6 +3987,7 @@ static int whereLoopAddBtree(
     pNew->prereq = mPrereq;
     pNew->nOut = rSize;
     pNew->u.btree.pIndex = pProbe;
+    pNew->u.btree.pOrderBy = 0;
     b = indexMightHelpWithOrderBy(pBuilder, pProbe, pSrc->iCursor);
 
     /* The ONEPASS_DESIRED flags never occurs together with ORDER BY */