Fix memory leak of InteriorReader.term. Comes up when doing queries

against large segments. (CVS 4315)

FossilOrigin-Name: 6c617bd89fc57881a2a308a6360e8ebb42835d46

diff --git a/ext/fts2/fts2.c b/ext/fts2/fts2.c
index 0d958cf73e84bfe5dd1d3a914d4905d522b3f1b4..1d2ad371d82a426401b697af898c94ad964cf972 100644 (file)
--- a/ext/fts2/fts2.c
+++ b/ext/fts2/fts2.c
@@ -4186,6 +4186,7 @@ typedef struct InteriorReader {
 } InteriorReader;
 
 static void interiorReaderDestroy(InteriorReader *pReader){
+  dataBufferDestroy(&pReader->term);
   SCRAMBLE(pReader);
 }
 

diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c
index fb27fdf9320cb98be5e3a003a0565825f4799213..7a808273c211660bb915f5993f9812c280d47d15 100644 (file)
--- a/ext/fts3/fts3.c
+++ b/ext/fts3/fts3.c
@@ -4221,6 +4221,7 @@ typedef struct InteriorReader {
 } InteriorReader;
 
 static void interiorReaderDestroy(InteriorReader *pReader){
+  dataBufferDestroy(&pReader->term);
   SCRAMBLE(pReader);
 }
 

diff --git a/manifest b/manifest
index 07cbefccf21809c1b5265c785149d09efb23d4f9..9fc493b5f998c01c61ddf40567068b8df1cc513f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C remove\sunused\sos_os2.h\s(CVS\s4314)
-D 2007-08-28T19:21:22
+C Fix\smemory\sleak\sof\sInteriorReader.term.\s\sComes\sup\swhen\sdoing\squeries\nagainst\slarge\ssegments.\s(CVS\s4315)
+D 2007-08-28T20:36:54
 F Makefile.in bfcc303429a5d9dcd552d807ee016c77427418c3
 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -37,7 +37,7 @@ F ext/fts1/simple_tokenizer.c 1844d72f7194c3fd3d7e4173053911bf0661b70d
 F ext/fts1/tokenizer.h 0c53421b832366d20d720d21ea3e1f6e66a36ef9
 F ext/fts2/README.tokenizers 2ff290e0a130f6e7611f2e608cb3b5aaea721abc
 F ext/fts2/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
-F ext/fts2/fts2.c 29992419e893a919c1f5cb14615d30a05cb20abb
+F ext/fts2/fts2.c 9a02a0db89b29b6185557ca7ca2d188a814ea64d
 F ext/fts2/fts2.h da5f76c65163301d1068a971fd32f4119e3c95fa
 F ext/fts2/fts2_hash.c cafebb4620d19684c4c9872530012441df60f503
 F ext/fts2/fts2_hash.h e283308156018329f042816eb09334df714e105e
@@ -49,7 +49,7 @@ F ext/fts2/fts2_tokenizer1.c 8a545c232bdffafd117c4eeaf59789691909f26a
 F ext/fts2/mkfts2amal.tcl 974d5d438cb3f7c4a652639262f82418c1e4cff0
 F ext/fts3/README.tokenizers a97c9a55b3422f6cb04af9de9296fe2447ea4a78
 F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
-F ext/fts3/fts3.c c77071d54e97bb10e7310b17fab048dfe1550466
+F ext/fts3/fts3.c f85d5d8fdf0c691d5d542917dffcdd8f6f570ed1
 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
 F ext/fts3/fts3_hash.c 84654768178452b00bbc986dd878a8299dc1e3dc
 F ext/fts3/fts3_hash.h af585d6867d478fc0457f64cfaae60e09541e63a
@@ -567,7 +567,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P af24e7d01a7fab5e33080a0f786e0bc6f610a6f3
-R 7b6245a3074068afb2d3762f9a7bccba
-U pweilbacher
-Z 22b40e71fe4c01610ac58736c86d61fe
+P dd43a2de3ed1659d70361370d07a184dd8ece45f
+R 70912c36e1c512cb72f986c6f3262b7a
+U shess
+Z e249b078ef5ae37e1d80116148f5bc5a

diff --git a/manifest.uuid b/manifest.uuid
index d779148aa541d3fb7f0bf4a1447baadc4cb20e28..620cbac58c8ef93d8600054d0a468ace7dc76662 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dd43a2de3ed1659d70361370d07a184dd8ece45f
\ No newline at end of file
+6c617bd89fc57881a2a308a6360e8ebb42835d46
\ No newline at end of file