From: drh <>
Date: Mon, 11 Jul 2022 19:12:47 +0000 (+0000)
Subject: In the sqlite_stmt extension, store the result of strlen() in a 64-bit
X-Git-Tag: version-3.40.0~317
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d5c2e084498eb5c235bf6fb8f85a9bc7d940035c;p=thirdparty%2Fsqlite.git

In the sqlite_stmt extension, store the result of strlen() in a 64-bit
integer to avoid a compiler warning, even though we know that the length
will always fit comfortably in 32 bits.

FossilOrigin-Name: 3fe19452499afc8e6b38905e1ce7e9153adbfebf10dccf39da4b7f1b0cd24f05
---

diff --git a/ext/misc/stmt.c b/ext/misc/stmt.c
index ac0ae6f0f6..42f4d651d9 100644
--- a/ext/misc/stmt.c
+++ b/ext/misc/stmt.c
@@ -220,7 +220,7 @@ static int stmtFilter(
   ppRow = &pCur->pRow;
   for(p=sqlite3_next_stmt(pCur->db, 0); p; p=sqlite3_next_stmt(pCur->db, p)){
     const char *zSql = sqlite3_sql(p);
-    int nSql = zSql ? strlen(zSql)+1 : 0;
+    sqlite3_int64 nSql = zSql ? strlen(zSql)+1 : 0;
     StmtRow *pNew = (StmtRow*)sqlite3_malloc(sizeof(StmtRow) + nSql);
 
     if( pNew==0 ) return SQLITE_NOMEM;
diff --git a/manifest b/manifest
index 43ac201263..48d79d477a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings\sabout\sunused\sdebugging\sfunctions\sin\streeview.c.
-D 2022-07-11T18:26:14.973
+C In\sthe\ssqlite_stmt\sextension,\sstore\sthe\sresult\sof\sstrlen()\sin\sa\s64-bit\ninteger\sto\savoid\sa\scompiler\swarning,\seven\sthough\swe\sknow\sthat\sthe\slength\nwill\salways\sfit\scomfortably\sin\s32\sbits.
+D 2022-07-11T19:12:47.468
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -344,7 +344,7 @@ F ext/misc/shathree.c 7b17615869a495659f1569ada1d8d3d21b4a24614f2746d93cc87ef7c0
 F ext/misc/showauth.c 732578f0fe4ce42d577e1c86dc89dd14a006ab52
 F ext/misc/spellfix.c 94df9bbfa514a563c1484f684a2df3d128a2f7209a84ca3ca100c68a0163e29f
 F ext/misc/sqlar.c 0ace5d3c10fe736dc584bf1159a36b8e2e60fab309d310cd8a0eecd9036621b6
-F ext/misc/stmt.c 72b23e1746bedcf6e36907e972383e7eb74940344da90b2965149739b55cc801
+F ext/misc/stmt.c 2d68161cb32de25b4510cb8662af2e1ffd4e41c6b7bfb3aa64a49468bb6d36c1
 F ext/misc/templatevtab.c 8a16a91a5ceaccfcbd6aaaa56d46828806e460dd194965b3f77bf38f14b942c4
 F ext/misc/totype.c fa4aedeb07f66169005dffa8de3b0a2b621779fd44f85c103228a42afa71853b
 F ext/misc/uint.c 053fed3bce2e89583afcd4bf804d75d659879bbcedac74d0fa9ed548839a030b
@@ -1979,8 +1979,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 fe39c8d5fd813308fb27a05ce257ff003d3c09c0372f500e8def5a528a2558b7
-R 5bb2b0fcce4a89358c79b40b17c80161
+P 4d6f907712e35eddf6af36eb823c3ccdfcdff1c63b2c224b3bcf34ffec95d511
+R bbab4139cbd2870e339b88582449a0e8
 U drh
-Z 724318672b57a46adc079d5ffb44d6e1
+Z fc97bd4702bf992952d5c0a51a0eeac2
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 85a69401bb..ac704ea9e0 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4d6f907712e35eddf6af36eb823c3ccdfcdff1c63b2c224b3bcf34ffec95d511
\ No newline at end of file
+3fe19452499afc8e6b38905e1ce7e9153adbfebf10dccf39da4b7f1b0cd24f05
\ No newline at end of file