From: stephan <stephan@noemail.net>
Date: Tue, 11 Jun 2024 17:04:02 +0000 (+0000)
Subject: When compiling shell.c in SQLITE_SHELL_FIDDLE mode, ensure that the shell_main_exit... 
X-Git-Tag: version-3.47.0~343
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf2710e0b61dbe5abd3b0017905dfc5cb6c21d8d;p=thirdparty%2Fsqlite.git

When compiling shell.c in SQLITE_SHELL_FIDDLE mode, ensure that the shell_main_exit goto label is reachable.

FossilOrigin-Name: 06e6f64533563ab9c059b773e5f0d78085df716f2624e547b7259f6789c3ffe0
---

diff --git a/manifest b/manifest
index 13e49b6582..939209fa63 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sconstant\sexpressions\sto\spre-computed\sconstants,\sbecause\sapparently\nMSVC\son\sARM\srequires\sthat.\n[forum:/forumpost/4feb1685cced0a8e|Forum\sthread\s4feb1685cced0a8e].
-D 2024-06-11T14:36:56.096
+C When\scompiling\sshell.c\sin\sSQLITE_SHELL_FIDDLE\smode,\sensure\sthat\sthe\sshell_main_exit\sgoto\slabel\sis\sreachable.
+D 2024-06-11T17:04:02.306
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -756,7 +756,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 7e8d23ce7cdbfedf351a47e759f2722e8182ca10fd7580be43f4ce1f1a228145
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c ea0b75fce45e1f2c22f50ed2b6e2ddd7f66640948d0fc79a397917b4236a74af
-F src/shell.c.in 77d12a0dab8724819e64a14d5fbaad91a934be2b22ad329708fba9ba78993f04
+F src/shell.c.in ad27d1d990e9e5fb7ae8fc38a717e91f55233714f59723e5618baf4a2a3d2b65
 F src/sqlite.h.in cbd3e4177791a61c056fd81e37a5b21bb6c8cb2ea8cac558c625974673f50acf
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
@@ -2195,8 +2195,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 56af06fa12104a1fe119d7087746011183af053834eac72d0fb69f60d98054c6
-R def5b52c86a78dc0bf7da94cc7c4fd06
-U drh
-Z d6a3d70e7ee8f5966f522c6fcbcbe498
+P 6c103aee6f146869a3e0c48694592f2e4c6b57ecdb4450f46e762c38b4e686f1
+R 0476a0c13890d8b5c65d486f3c7c6f13
+U stephan
+Z 3e50a8e3e5517fc31eec2359fe1a9a43
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 227fbc4795..1e83978cd4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6c103aee6f146869a3e0c48694592f2e4c6b57ecdb4450f46e762c38b4e686f1
\ No newline at end of file
+06e6f64533563ab9c059b773e5f0d78085df716f2624e547b7259f6789c3ffe0
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index a664e2cbc5..58475dd6da 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -12860,7 +12860,9 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
           (unsigned int)(sqlite3_memory_used()-mem_main_enter));
   }
 #endif
-#endif /* !SQLITE_SHELL_FIDDLE */
+#else /* SQLITE_SHELL_FIDDLE... */
+  shell_main_exit:
+#endif
   return rc;
 }