Fix a memory leak in the SELECT code generator tracing logic (code that is

omitted in non-debugging builds).

FossilOrigin-Name: b623ebd859dcb1d99398aa9953f6b113bad26304

diff --git a/manifest b/manifest
index 6f4fc284aa84f61d9fd27d29d09fc8af515c19a7..11361b4b2a30dd36c7acd644c56c365a26e295c4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sobscure\sproblem\swith\s"INSERT\sINTO\stbl(cols)\sSELECT"\sstatements\swhere\sthe\sSELECT\sis\sa\scompound\swith\san\sORDER\sBY\sand\s"cols"\sis\sa\sstrict\ssubset\sof\stbl's\scolumns.
-D 2015-04-21T15:49:04.252
+C Fix\sa\smemory\sleak\sin\sthe\sSELECT\scode\sgenerator\stracing\slogic\s(code\sthat\sis\nomitted\sin\snon-debugging\sbuilds).
+D 2015-04-21T16:09:07.623
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in faaf75b89840659d74501bea269c7e33414761c1
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -230,7 +230,7 @@ F src/printf.c 08fa675c200aac29e561c6153f91f909ed17612f
 F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 F src/resolve.c 53486a98c17b7ae09b8c2b398013e973ce4c1aae
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
-F src/select.c b14a9e1ee035166df10f8f5c9379ac697ef43f62
+F src/select.c 3b64da1c1130a9c82a9b5d3afe1d44ab8a31f25a
 F src/shell.c 78eabce4c16c45e36fea2368f95118116399ba8a
 F src/sqlite.h.in ca27603a36fcacdaac5a19d8ee35aaff8ce8516f
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
@@ -1252,7 +1252,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 d1e6bc918b0c8e0701f5e15afb91b84a9004231b
-R 7ccd1057167111672b7d4496a5645687
-U dan
-Z 692b69290119d874ac81343f57f21abd
+P 718d5d0eab045a874107e078a857226a80ab912d
+R 7e6bc612737dab76da35e37065b9b922
+U drh
+Z ba983635f4ecc26ab029799e1b9c58b7

diff --git a/manifest.uuid b/manifest.uuid
index 90ab0db88f33c1088c1103890ce3ffa16118d133..e6e16b709bcf560ad0eb5284047a9efc98ddbb3f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-718d5d0eab045a874107e078a857226a80ab912d
\ No newline at end of file
+b623ebd859dcb1d99398aa9953f6b113bad26304
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 09186668a49fe204622ec3d4fb41ed60e5e2a799..6a18ff4599f19c333e7bb3c1b6fbddd3c677c05e 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -5538,6 +5538,7 @@ void sqlite3TreeViewSelect(TreeView *pView, const Select *p, u8 moreToFollow){
       StrAccum x;
       char zLine[100];
       sqlite3StrAccumInit(&x, zLine, sizeof(zLine), 0);
+      x.useMalloc = 0;
       sqlite3XPrintf(&x, 0, "{%d,*}", pItem->iCursor);
       if( pItem->zDatabase ){
         sqlite3XPrintf(&x, 0, " %s.%s", pItem->zDatabase, pItem->zName);