From: dan <Dan Kennedy>
Date: Fri, 16 Apr 2021 17:09:58 +0000 (+0000)
Subject: Fix another undefined behaviour in fts3 that could follow an OOM error.
X-Git-Tag: version-3.36.0~193
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c68e556894b97059c857ba681c050b843ae5b31;p=thirdparty%2Fsqlite.git

Fix another undefined behaviour in fts3 that could follow an OOM error.

FossilOrigin-Name: fac3ff857c4abdb44f59849af80d93a5bd4b64f088e5164fb5ad0be8d14748b7
---

diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c
index 5c87d7f400..e1c8b49c05 100644
--- a/ext/fts3/fts3.c
+++ b/ext/fts3/fts3.c
@@ -5130,16 +5130,15 @@ static int fts3EvalStart(Fts3Cursor *pCsr){
 #ifndef SQLITE_DISABLE_FTS4_DEFERRED
   if( rc==SQLITE_OK && nToken>1 && pTab->bFts4 ){
     Fts3TokenAndCost *aTC;
-    Fts3Expr **apOr;
     aTC = (Fts3TokenAndCost *)sqlite3_malloc64(
         sizeof(Fts3TokenAndCost) * nToken
       + sizeof(Fts3Expr *) * nOr * 2
     );
-    apOr = (Fts3Expr **)&aTC[nToken];
 
     if( !aTC ){
       rc = SQLITE_NOMEM;
     }else{
+      Fts3Expr **apOr = (Fts3Expr **)&aTC[nToken];
       int ii;
       Fts3TokenAndCost *pTC = aTC;
       Fts3Expr **ppOr = apOr;
diff --git a/manifest b/manifest
index 5bc67d01e5..b1f4d1c66b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\ssigned\sinteger\soverflow\swhen\sfinding\ssnippets\sin\sfts3\sby\susing\s64-bit\sinteger\soffsets.
-D 2021-04-16T16:55:28.621
+C Fix\sanother\sundefined\sbehaviour\sin\sfts3\sthat\scould\sfollow\san\sOOM\serror.
+D 2021-04-16T17:09:58.279
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -84,7 +84,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 8912fedb1bf647eb05fa940032af0cc77ed492225da8b180228233bc5ebf8158
+F ext/fts3/fts3.c 1d80d0a1e53ce5e7316e1379969c842079c46237369e131fd378288e64ebbf5f
 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
 F ext/fts3/fts3Int.h bde280294d56ff50ee29d03e5140f0b6953b44d1c969bb5831e8ae85e3e76715
 F ext/fts3/fts3_aux.c 1af58af8f2b00a49f4fb1c2602f8da2054ad60076f46c8ebf85c5410eccccb65
@@ -1912,7 +1912,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 6af4e6d054efd8445e1010aabd584f36e70dfad0de13bd0e2f1761cad4d9a7d6
-R bb2fc97da9924027621d054c5f109d3c
+P 4cc09a872f627f4a2b94345bef07cd49c3ec3627f8d78c1eb091741cdb4ec0b3
+R 2a5761d64fc18087eb15381861d2fee6
 U dan
-Z d63dd194e7fabc0d0616c3cb1802e30f
+Z f2ad55744cfa962d7ec699c92bf4fdca
diff --git a/manifest.uuid b/manifest.uuid
index ecf5bec39a..5e4fe0a260 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4cc09a872f627f4a2b94345bef07cd49c3ec3627f8d78c1eb091741cdb4ec0b3
\ No newline at end of file
+fac3ff857c4abdb44f59849af80d93a5bd4b64f088e5164fb5ad0be8d14748b7
\ No newline at end of file