Defensive code in sqlite3TreeViewWindow() to fix a compiler warning.

FossilOrigin-Name: b250c218b4b6327a1cae3edbc037625ba998f89ee13a9bfbc2cefd1edfc4b768

diff --git a/manifest b/manifest
index 7b6ffe4c91a967d038adb1e22e933b9306a61eff..73f80eb148b7421c83c877842de2c0dd77101eea 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Simplified\sfix\sto\sthe\sproblem\swith\ssubroutine\sreuse\sin\sthe\sRIGHT\sJOIN\sno-match\nlogic\sfor\sa\ssubquery\son\sthe\sright-hand\sside\sof\san\sIN\soperator.\s\sThe\scode\sstill\nneeds\ssimplification.
-D 2022-04-30T18:40:22.156
+C Defensive\scode\sin\ssqlite3TreeViewWindow()\sto\sfix\sa\scompiler\swarning.
+D 2022-04-30T19:55:28.101
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -618,7 +618,7 @@ F src/test_window.c cdae419fdcea5bad6dcd9368c685abdad6deb59e9fc8b84b153de513d394
 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
 F src/tokenize.c a38f52058b517929e264094abd0b5fd1e8e145a1aa43bc6f6a72ae5218f96c98
-F src/treeview.c 7dd99cf420137d658492bbf3601d55fce9c34d4788606f43d83937b73474769c
+F src/treeview.c a47e4246396118f3d5a1c524de15e6fffaf02036be192d4339e887a2a9bf36b1
 F src/trigger.c 372ada38f667c6823a3db15749eb668338e65c793394e55a37e56a489f2d1b55
 F src/update.c 2cfaded82ca80ff56afb8c3ae5e88284e0824bfd86119827cc22481959f96f92
 F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
@@ -1951,8 +1951,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P a8da85c57e07721dc1c918d67433d6c99ce48421e369123cc3194d855e55f7e8
-R 8dafede96e6eddf2103c6fe2efc2c0f1
+P a193749730d6cfba617f2a64e7254c78f92bbf29b109c19055fc33f6cc643d4c
+R 1d2a81ecbf1d09fa752247278562e6d1
 U drh
-Z 677c686e7cbb46a3d1010c0d9d90814e
+Z 7657291be748b0693bb1bbfc76537229
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 0915dc636cd8c730884fcf599d9d8d80d7eb37c0..2ad4ff62c9805ddb463a7d042e451f4c1aa571e4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a193749730d6cfba617f2a64e7254c78f92bbf29b109c19055fc33f6cc643d4c
\ No newline at end of file
+b250c218b4b6327a1cae3edbc037625ba998f89ee13a9bfbc2cefd1edfc4b768
\ No newline at end of file

diff --git a/src/treeview.c b/src/treeview.c
index 0f9b588f5aaaa24fb79b3712d91412c2b05cede5..3d5bd7175bfd443cd477b360b59ed5213bb3fb68 100644 (file)
--- a/src/treeview.c
+++ b/src/treeview.c
@@ -397,6 +397,7 @@ void sqlite3TreeViewBound(
 */
 void sqlite3TreeViewWindow(TreeView *pView, const Window *pWin, u8 more){
   int nElement = 0;
+  if( pWin==0 ) return;
   if( pWin->pFilter ){
     sqlite3TreeViewItem(pView, "FILTER", 1);
     sqlite3TreeViewExpr(pView, pWin->pFilter, 0);