From: dan <Dan Kennedy>
Date: Fri, 5 Aug 2022 17:16:00 +0000 (+0000)
Subject: Avoid having fts3 read uninitialized values when processing deferred tokens.
X-Git-Tag: version-3.40.0~257
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e658f0a13da40b920241329ec87fe9c9c16b111;p=thirdparty%2Fsqlite.git

Avoid having fts3 read uninitialized values when processing deferred tokens.

FossilOrigin-Name: 98729c5fa6c4c418ca9779c35e6874c930e5cee5a90b5eb32b284a0f3762269e
---

diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c
index 1a1672512a..3b73fbba1d 100644
--- a/ext/fts3/fts3.c
+++ b/ext/fts3/fts3.c
@@ -4376,7 +4376,7 @@ static int fts3EvalDeferredPhrase(Fts3Cursor *pCsr, Fts3Phrase *pPhrase){
         nDistance = iPrev - nMaxUndeferred;
       }
 
-      aOut = (char *)sqlite3_malloc(nPoslist+8);
+      aOut = (char *)sqlite3Fts3MallocZero(nPoslist+FTS3_BUFFER_PADDING);
       if( !aOut ){
         sqlite3_free(aPoslist);
         return SQLITE_NOMEM;
diff --git a/manifest b/manifest
index 16ad722e8f..ab1066930e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarning\sseen\swith\sMSVC.
-D 2022-08-05T05:30:07.478
+C Avoid\shaving\sfts3\sread\suninitialized\svalues\swhen\sprocessing\sdeferred\stokens.
+D 2022-08-05T17:16:00.185
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -102,7 +102,7 @@ F ext/fts3/README.content b9078d0843a094d86af0d48dffbff13c906702b4c3558012e67b9c
 F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a
 F ext/fts3/README.tokenizers b92bdeb8b46503f0dd301d364efc5ef59ef9fa8e2758b8e742f39fa93a2e422d
 F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
-F ext/fts3/fts3.c 8cd361bd8612de3e5ec451d33ced8575cbc5af6744e7efc05d54bde4d2df3cd0
+F ext/fts3/fts3.c b20bd583991e740c1e14371896f3ab61d7b6c033740646366bbf6667191bc4e2
 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
 F ext/fts3/fts3Int.h dafdc371f9fbab175744b06cfe019d5f040cdfdbd11fea752f5dc28d45b04c05
 F ext/fts3/fts3_aux.c f0dc9bd98582615b7750218899bd0c729879b6bbf94d1be57ca1833ff49afc6f
@@ -1981,8 +1981,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 6c806f64bbc9e98891bad0868575ee2ec5d0951ceb0c71d3ed417b45d5f27561
-R 93de007b6ed89be23aeb731b205e5be2
-U mistachkin
-Z 19aad0410826162a6654bad862e7b83b
+P e36217f2536d89f7a15a879fe3ead32307909c71ced42e1ae7b35f43d4744a80
+R 9810d4cb92a49345fdc5e6b1d4c32ce1
+U dan
+Z 17935eeb35e00b5bc2c7ef71b0671232
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 846e2e7574..92d41db7f5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e36217f2536d89f7a15a879fe3ead32307909c71ced42e1ae7b35f43d4744a80
\ No newline at end of file
+98729c5fa6c4c418ca9779c35e6874c930e5cee5a90b5eb32b284a0f3762269e
\ No newline at end of file