From: larrybr <larrybr@noemail.net>
Date: Mon, 13 Nov 2023 13:01:01 +0000 (+0000)
Subject: Fix var-intro after executable code departure from old C.
X-Git-Tag: version-3.45.0~134^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=41d4b7bdeec2c982e75dbd83cd7c89148c7a6b64;p=thirdparty%2Fsqlite.git

Fix var-intro after executable code departure from old C.

FossilOrigin-Name: 08996f4fd52f5742e77225ce3da2ac43ea5cc44bb0d8d21126b6d624273842a5
---

diff --git a/manifest b/manifest
index e985a98d08..33cb884f0d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Slight\scleanup\sof\slength-limited\sstrpbrk()\sreplacement,\sand\seliminate\sstrpbrk()\scall.
-D 2023-11-13T12:53:47.904
+C Fix\svar-intro\safter\sexecutable\scode\sdeparture\sfrom\sold\sC.
+D 2023-11-13T13:01:01.956
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -728,7 +728,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c d017bad7ba8e778617701a0e986fdeb393d67d6afa84fb28ef4e8b8ad2acf916
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 503331aca8785254a7bf3d74ab338a99118fa297e1184a4dde33b3cdf7a9d341
-F src/shell.c.in 0bc051f506f812be03351673aa206cc87cfac47ccc04e60191c984bb79e38265
+F src/shell.c.in 6317180fce95b4d994423047648676e9d8c4bd7b82ab8ad98644a9e9a81ff24c
 F src/sqlite.h.in 4f841d3d117b830ee5ee45e8d89ceff1195f3ebb72d041ace8d116ba4c103b35
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
@@ -2142,8 +2142,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 906c5c4082e30b7a0d07df89a42566461e2113507c5a0b339827ca0822b8fe84
-R ea455f9417313759f4a37b1578d0b70c
+P 97e2c9621e3e01048e33da63ca4146ededa33cf6adefa996fa49b8c6a8d555b5
+R 9e09f295654f16b3a3c0e5e6e0bcae0d
 U larrybr
-Z 3d1eb938bb91a620d97eb2c42b47a7fe
+Z 4863af021829bb44bd729f706b66926d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9359c7a103..e0b6ffab58 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-97e2c9621e3e01048e33da63ca4146ededa33cf6adefa996fa49b8c6a8d555b5
\ No newline at end of file
+08996f4fd52f5742e77225ce3da2ac43ea5cc44bb0d8d21126b6d624273842a5
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index bb542fd1c4..03cadd639a 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -1824,8 +1824,8 @@ static void output_quoted_escaped_string(const char *z){
 ** With ns == ~0, is like strpbrk(s,zAny) and s must be 0-terminated.
 */
 static const char *anyOfInStr(const char *s, const char *zAny, size_t ns){
-  if( ns == ~0 ) ns = strlen(s);
   const char *pcFirst = 0;
+  if( ns == ~0 ) ns = strlen(s);
   while(*zAny){
     const char *pc = (const char*)memchr(s, *zAny&0xff, ns);
     if( pc ){