Fix an obscure memory leak in the SQL compiler.. (CVS 4070)

FossilOrigin-Name: d4ab94288b1e3d3d069ccc75d0fc2fbe6c1383c5

diff --git a/manifest b/manifest
index 5424814d9293c0681409ae8c8c8eb6e22328df14..4ea62c6930f4d02effc47c87b4035a4452a930dd 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\smemory\sleak\sthat\swas\sdiscovered\sby\sthe\stests\sthat\swere\sadded\sto\ncover\sticket\s#2339.\s(CVS\s4069)
-D 2007-06-15T15:31:50
+C Fix\san\sobscure\smemory\sleak\sin\sthe\sSQL\scompiler..\s(CVS\s4070)
+D 2007-06-15T16:37:29
 F Makefile.in b9971ab07868cf2b3209fe3bf8c52e7e25af4193
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -72,7 +72,7 @@ F src/complete.c 7d1a44be8f37de125fcafd3d3a018690b3799675
 F src/date.c 6049db7d5a8fdf2c677ff7d58fa31d4f6593c988
 F src/delete.c 5c0d89b3ef7d48fe1f5124bfe8341f982747fe29
 F src/experimental.c 1b2d1a6cd62ecc39610e97670332ca073c50792b
-F src/expr.c 97819d6a4f2863dd5b04ad1ccd41a1d6bf043a01
+F src/expr.c b68f1b208be50413b407da92bd7b0fce840999cf
 F src/func.c 4668843e6f0d27653939e12fc32276fb8e38d21a
 F src/hash.c 67b23e14f0257b69a3e8aa663e4eeadc1a2b6fd5
 F src/hash.h 1b3f7e2609141fd571f62199fc38687d262e9564
@@ -505,7 +505,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 32218834b80b1ba900c52e43a2e59783a2553897
-R 8c6ece4f58210bbfb811dd967ab2ba6d
-U drh
-Z 9eac641c488d35429a98333827efea5b
+P 1d10a489340718cc708e11e28e7bb31c67e00ad8
+R 9fe50d18cd28bd8cd5d536116efc2ce9
+U danielk1977
+Z cfd25d2e291df33ba153e7f53553abed

diff --git a/manifest.uuid b/manifest.uuid
index f959e7da6ccb9a63f3554b7eb917b03b1731e411..568d65a56d6656ad05c7dd831c41ea8fa1e12bdc 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1d10a489340718cc708e11e28e7bb31c67e00ad8
\ No newline at end of file
+d4ab94288b1e3d3d069ccc75d0fc2fbe6c1383c5
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 5c48c0b5efb854c88f61a1dbc242fcd4f7467dc1..b2ff41a79fb418ab20198cdb368eb4a489db796e 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -12,7 +12,7 @@
 ** This file contains routines used for analyzing expressions and
 ** for generating VDBE code that evaluates expressions in SQLite.
 **
-** $Id: expr.c,v 1.297 2007/06/08 00:20:48 drh Exp $
+** $Id: expr.c,v 1.298 2007/06/15 16:37:29 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -1147,6 +1147,8 @@ static int lookupName(
             pDup->pColl = pExpr->pColl;
             pDup->flags |= EP_ExpCollate;
           }
+          if( pExpr->span.dyn ) sqliteFree((char*)pExpr->span.z);
+          if( pExpr->token.dyn ) sqliteFree((char*)pExpr->token.z);
           memcpy(pExpr, pDup, sizeof(*pExpr));
           sqliteFree(pDup);
           cnt = 1;