From: drh <>
Date: Mon, 22 Nov 2021 12:59:44 +0000 (+0000)
Subject: In the previous check-in, do not overwrite the SQLITE_CORRUPT signal with
X-Git-Tag: version-3.37.0~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=156d44104af2c412ae487ee270ca9de29f9e815b;p=thirdparty%2Fsqlite.git

In the previous check-in, do not overwrite the SQLITE_CORRUPT signal with
an SQLITE_OK before exiting fts3auxNextMethod().

FossilOrigin-Name: 396688ae5c10b9e7df1c76a3c6f548abf7a7ddad50c25fb23e194201dbb2e857
---

diff --git a/ext/fts3/fts3_aux.c b/ext/fts3/fts3_aux.c
index 1053f5d40b..d3b194c942 100644
--- a/ext/fts3/fts3_aux.c
+++ b/ext/fts3/fts3_aux.c
@@ -297,6 +297,7 @@ static int fts3auxNextMethod(sqlite3_vtab_cursor *pCursor){
     if( fts3auxGrowStatArray(pCsr, 2) ) return SQLITE_NOMEM;
     memset(pCsr->aStat, 0, sizeof(struct Fts3auxColstats) * pCsr->nStat);
     iCol = 0;
+    rc = SQLITE_OK;
 
     while( i<nDoclist ){
       sqlite3_int64 v = 0;
@@ -352,7 +353,6 @@ static int fts3auxNextMethod(sqlite3_vtab_cursor *pCursor){
     }
 
     pCsr->iCol = 0;
-    rc = SQLITE_OK;
   }else{
     pCsr->isEof = 1;
   }
diff --git a/manifest b/manifest
index c7aac75aa9..4087b34bd4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\scrash\sin\sthe\sfts3aux\scode\sthat\scould\soccur\shandling\scorrupt\srecords.
-D 2021-11-22T08:12:14.863
+C In\sthe\sprevious\scheck-in,\sdo\snot\soverwrite\sthe\sSQLITE_CORRUPT\ssignal\swith\nan\sSQLITE_OK\sbefore\sexiting\sfts3auxNextMethod().
+D 2021-11-22T12:59:44.150
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -87,7 +87,7 @@ F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
 F ext/fts3/fts3.c da41de21622774b1cb8c3415e8d2a6961ad7c978ab534f2a54434f76a5c4dfbc
 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
 F ext/fts3/fts3Int.h cff59b8b13dafe9d59924a5d710f771ed8b121a55cccbc99b6e2a723fcde14dc
-F ext/fts3/fts3_aux.c e0588984d16449bd1a5334606627a9db79913bb0f6003efded166a67cae7b2ed
+F ext/fts3/fts3_aux.c f0dc9bd98582615b7750218899bd0c729879b6bbf94d1be57ca1833ff49afc6f
 F ext/fts3/fts3_expr.c 903bfb9433109fffb10e910d7066c49cbf8eeae316adc93f0499c4da7dfc932a
 F ext/fts3/fts3_hash.c 8b6e31bfb0844c27dc6092c2620bdb1fca17ed613072db057d96952c6bdb48b7
 F ext/fts3/fts3_hash.h 39cf6874dc239d6b4e30479b1975fe5b22a3caaf
@@ -1933,7 +1933,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 0eafbc2f31b83f48833b19894ff3252a63c319ff501506ef9f744cca813a3a24
-R c8d194f01ea70c0f8e9ded20e982f86d
-U dan
-Z 5b833fcd8d1687ed54ab4812425b362e
+P cdcd65b89ecffd380483404f5b1379beffd7ff107acaa5bc1185651cfacaa220
+R 208501928dfb9dc3efdb2329a03f3d97
+U drh
+Z 888c3a6e3f637c09abad8905bf2a9680
diff --git a/manifest.uuid b/manifest.uuid
index b2cfa4cd19..f42ae966c7 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cdcd65b89ecffd380483404f5b1379beffd7ff107acaa5bc1185651cfacaa220
\ No newline at end of file
+396688ae5c10b9e7df1c76a3c6f548abf7a7ddad50c25fb23e194201dbb2e857
\ No newline at end of file