Fix a memory leak associated with the FTS4 matchinfo() function.

FossilOrigin-Name: fb8da82411b80a234c6a5481622027815450996a

diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c
index 582b7e27a105be28f24011938fde34dc6dd7cf80..2b93c6271576c8416d109120803c8556a51057f9 100644 (file)
--- a/ext/fts3/fts3.c
+++ b/ext/fts3/fts3.c
@@ -3116,6 +3116,7 @@ static int fts3FilterMethod(
   /* In case the cursor has been used before, clear it now. */
   sqlite3_finalize(pCsr->pStmt);
   sqlite3_free(pCsr->aDoclist);
+  sqlite3_free(pCsr->aMatchinfo);
   sqlite3Fts3ExprFree(pCsr->pExpr);
   memset(&pCursor[1], 0, sizeof(Fts3Cursor)-sizeof(sqlite3_vtab_cursor));
 

diff --git a/manifest b/manifest
index d52803d558e4f547324a5d046e7aa0319b187057..213759fab2c4d5c3a1aa6c47159bfc151235aee7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\salways-true\sbranch\sin\swhereRangeScanEst().\s\sReplace\sit\swith\san\nassert().
-D 2014-10-08T19:33:54.518
+C Fix\sa\smemory\sleak\sassociated\swith\sthe\sFTS4\smatchinfo()\sfunction.
+D 2014-10-09T14:00:49.227
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -78,7 +78,7 @@ F ext/fts3/README.content fdc666a70d5257a64fee209f97cf89e0e6e32b51
 F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a
 F ext/fts3/README.tokenizers e0a8b81383ea60d0334d274fadf305ea14a8c314
 F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
-F ext/fts3/fts3.c 66f39c425fa834b939d06caeeb14f49e038d443b
+F ext/fts3/fts3.c 8b6cceb3e0be22da26d83a3cec0e0e337e6b8ec6
 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
 F ext/fts3/fts3Int.h 53d4eca1fb23eab00681fb028fb82eb5705c1e21
 F ext/fts3/fts3_aux.c 5c211e17a64885faeb16b9ba7772f9d5445c2365
@@ -1203,7 +1203,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 6483d426c4c5c772cd49412ea37e0fa7a0378904
-R df1d18db7990f8a7d78a79273193f180
+P 42e48fd3a6a6219d9bd6135d821b38c5157922ba
+R b5e5fdd1e3ce299c36e7187cabf29d23
 U drh
-Z 70427f180e63fb554c9a4909a2862788
+Z 0cd30ecf2cac304fdb077fd52d8a3789

diff --git a/manifest.uuid b/manifest.uuid
index ba92b776aa1f853017cf11646442475c4e40f40b..261ccbda05bc2dbb09d954f8932051e4a156070d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-42e48fd3a6a6219d9bd6135d821b38c5157922ba
\ No newline at end of file
+fb8da82411b80a234c6a5481622027815450996a
\ No newline at end of file