Fix memory leak in where.c. (CVS 3271)

FossilOrigin-Name: 3d10e8f36113a189aa19ecd99007cd0a926b2f8a

diff --git a/manifest b/manifest
index 288f2f1c5005d50886b4fcfb5af06c3a77d1fa11..f7eeb44e3a551ee9d624833ac9bbfab81253f47a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stests\sto\sensure\san\sINSERT/UPDATE/DELETE\simmediately\safter\svirtual\stable\sconstruction\sdoes\snot\sfail.\s(CVS\s3270)
-D 2006-06-19T03:05:10
+C Fix\smemory\sleak\sin\swhere.c.\s(CVS\s3271)
+D 2006-06-19T04:49:35
 F Makefile.in f839b470345d3cb4b0644068474623fe2464b5d3
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -105,7 +105,7 @@ F src/vdbeaux.c dc5cfd11a0529fcfd217a1807f7c9df513f1c276
 F src/vdbefifo.c 9efb94c8c3f4c979ebd0028219483f88e57584f5
 F src/vdbemem.c 5f0afe3b92bb2c037f8d5d697f7c151fa50783a3
 F src/vtab.c 8fbf4a8f718229d2158826ed6e440f2d32a07c80
-F src/where.c d7c3cc011834882b2d58ebb3a6a1a569ead7ebd7
+F src/where.c 0f1fcc2c7446b6dd947bf0069487b3ff282043ee
 F tclinstaller.tcl 046e3624671962dc50f0481d7c25b38ef803eb42
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/all.test 5df90d015ca63fcef2a4b62c24f7316b66c4bfd4
@@ -295,7 +295,7 @@ F test/vtab1.test 97d68ca03f18ed14ffec6420363a13b486fd66bb
 F test/vtab2.test b8daa5d9989c3096a294bce0f614ff6f37db0f99
 F test/vtab3.test b3ea5dfdc36ba23ba5136928b6c307c5125ababc
 F test/vtab4.test 4b4293341443839ef6dc02f8d9e614702a6c67ff
-F test/vtab5.test a76f85c2762b96b96ce7c82e496102533049d80b
+F test/vtab5.test a2dc67f499256aa1656ee693c2157ba8c7fc01bb
 F test/where.test ee7c9a6659b07e1ee61177f6e7ff71565ee2c9df
 F test/where2.test a16476a5913e75cf65b38f2daa6157a6b7791394
 F test/where3.test 3b5ad2c58069e12be2bd86bc5e211a82810521aa
@@ -371,7 +371,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P e08e2ddafe909ae6073ec56dfa3fdca23e36bf2e
-R 4cf9e2b8592ece2ea2925c06bcdec672
+P 144d0eb13aed4507e93edec781b1819a068f4a70
+R a120b8d6587e73f986b4b3f1c6fadbd5
 U danielk1977
-Z e0e66e994bedc3899b9799edc6b24f36
+Z edb5bd8fa3b46fcad539c9bb0dac2b2a

diff --git a/manifest.uuid b/manifest.uuid
index e8361ff13f9af74d524b686e6852fd0047166c8f..9872c605e89febe4b1fbafacdbf60f085d28ad4f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-144d0eb13aed4507e93edec781b1819a068f4a70
\ No newline at end of file
+3d10e8f36113a189aa19ecd99007cd0a926b2f8a
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 521644e27ffa07aafc13040273f2632e03a55fb8..28b85336d243625b09e5ba1019e317f1bba1b15c 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -16,7 +16,7 @@
 ** so is applicable.  Because this module is responsible for selecting
 ** indices, you might also think of this module as the "query optimizer".
 **
-** $Id: where.c,v 1.218 2006/06/14 22:07:11 drh Exp $
+** $Id: where.c,v 1.219 2006/06/19 04:49:35 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 
@@ -1720,6 +1720,7 @@ WhereInfo *sqlite3WhereBegin(
   if( sqlite3MallocFailed() ){
     goto whereBeginNoMem;
   }
+  pWInfo->nLevel = pTabList->nSrc;
   pWInfo->pParse = pParse;
   pWInfo->pTabList = pTabList;
   pWInfo->iBreak = sqlite3VdbeMakeLabel(v);

diff --git a/test/vtab5.test b/test/vtab5.test
index b1391452f14d34c1a23646933c1f78bfcf8affe7..f2b5cc29f2853f785ada00fb5bb7991da5fe2bf6 100644 (file)
--- a/test/vtab5.test
+++ b/test/vtab5.test
@@ -10,7 +10,7 @@
 #***********************************************************************
 # This file implements regression tests for SQLite library.
 #
-# $Id: vtab5.test,v 1.1 2006/06/19 03:05:10 danielk1977 Exp $
+# $Id: vtab5.test,v 1.2 2006/06/19 04:49:35 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -36,9 +36,10 @@ do_test vtab5-1.1 {
 
 do_test vtab5.1.2 {
   execsql {
-    SELECT * FROM treal;
+    SELECT * FROM techo;
   }
 } {a b c}
+
 do_test vtab5.1.3 {
   db close
   sqlite3 db test.db