Fix a memory leak associated with PRIMARY KEY in a CREATE TABLE statement

that fails.  Ticket #249. (CVS 1730)

FossilOrigin-Name: 66158843dfa073ffb8779a5170e091cebc018855

diff --git a/manifest b/manifest
index ded2b2ed930a015ce0c33a7bf8a6b054886117df..67053a5f40670855c82a3206997d6d7e416aa5ad 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\sthe\sright\stable\sin\sa\sLEFT\sOUTER\sJOIN\scontains\san\sINTEGER\sPRIMARY\sKEY\nmake\ssure\sthat\skey\sis\sNULL\sif\sthere\sis\sno\srow\sin\sthe\sright\stable\sthat\nmatches\sthe\scurrent\srow\sin\sthe\sleft\stable.\s\sTickets\s#246\sand\s#247.\s(CVS\s873)
-D 2003-02-20T01:48:13
+C Fix\sa\smemory\sleak\sassociated\swith\sPRIMARY\sKEY\sin\sa\sCREATE\sTABLE\sstatement\nthat\sfails.\s\sTicket\s#249.\s(CVS\s1730)
+D 2003-02-26T13:52:51
 F Makefile.in 6606854b1512f185b8e8c779b8d7fc2750463d64
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -21,7 +21,7 @@ F sqlite.1 83f4a9d37bdf2b7ef079a82d54eaf2e3509ee6ea
 F src/auth.c f37bfc9451b8c1fa52f34adff474560018892729
 F src/btree.c 2a0305ccbe617266ac3524805e0c6ef55a9f9cb7
 F src/btree.h 36a7a26a29382c2b1a519b42bb125880d46d00d4
-F src/build.c 757b1a37436b55b43c8eb41436a23a0ce8cad447
+F src/build.c 02a106e40f0577437284fb78ebdd0a5443dc972c
 F src/delete.c cbd499f3f9297504c42e328af89bef1a2113d04c
 F src/encode.c faf03741efe921755ec371cf4a6984536de00042
 F src/expr.c bd690b3a6174e97a0f16800e78c8aeae749a4e71
@@ -65,7 +65,7 @@ F test/btree2.test e3b81ec33dc2f89b3e6087436dfe605b870c9080
 F test/btree3.test e597fb59be2ac0ea69c62aaa2064e998e528b665
 F test/btree4.test fa955a3d7a8bc91d6084b7f494f9e5d1bdfb15b6
 F test/capi2.test 0c82193ae67978c431e2ffc3259b544dc8fdd138
-F test/conflict.test d7d9dbea9909c1b843f9e89c8318fdb7ca07a5e5
+F test/conflict.test 80cf3780c8686b92db4ce0f60bca46a000537327
 F test/copy.test 73df5ed3112e858e006a8b7ddb4c9bab6a25d0fb
 F test/delete.test 5821a95a66061ae09723a88938f23d10d8a881ad
 F test/expr.test 290e2617b89b5c5e3bf71f19367d285102128be4
@@ -83,9 +83,9 @@ F test/limit.test 9ffb965a0f5bf7152187ef3d8d1249b96e5620bf
 F test/lock.test 388a3a10962d2d571c0c1821cc35bf069ee73473
 F test/main.test c66b564554b770ee7fdbf6a66c0cd90329bc2c85
 F test/malloc.test 7ba32a9ebd3aeed52ae4aaa6d42ca37e444536fd
-F test/memleak.test b4f59aa44488793b00feff2011d77d0f05b22468
+F test/memleak.test a18e6810cae96d2f6f5136920267adbefc8e1e90
 F test/minmax.test 29bc5727c3e4c792d5c4745833dd4b505905819e
-F test/misc1.test 2876987a723b4053db081069007cd6aadf80b62b
+F test/misc1.test 865c907df58195364eaf2e69426e9674bc8d1a8c
 F test/misuse.test a3aa2b18a97e4c409a1fcaff5151a4dd804a0162
 F test/notnull.test 7a08117a71e74b0321aaa937dbeb41a09d6eb1d0
 F test/null.test 5c2b57307e4b6178aae825eb65ddbee01e76b0fd
@@ -155,7 +155,7 @@ F www/speed.tcl cb4c10a722614aea76d2c51f32ee43400d5951be
 F www/sqlite.tcl ae3dcfb077e53833b59d4fcc94d8a12c50a44098
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
-P 6ef91a364b2922f078b7de81816bca3f2ca0fe46
-R 6cd2342e328368bdcfdfb261e7153b9c
+P 6a45fe3bd7e19cf9c20fc6cb65b0269cdd704490
+R dc727e1053fa9644419f9b675fcc2f6a
 U drh
-Z 02cf9dbf86ae6f6970569d7a82f43c8c
+Z 312e9f251ccc372868ea8e5b5518a8b3

diff --git a/manifest.uuid b/manifest.uuid
index b141deb5d600fe1a3c616f6bf0322368db511064..334e920ab784aa36cc77eb04747af44da2808808 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6a45fe3bd7e19cf9c20fc6cb65b0269cdd704490
\ No newline at end of file
+66158843dfa073ffb8779a5170e091cebc018855
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index e272376faf7b010a034b3890c1307e86b9d5366e..f0dd8ef67a08dfadde13ed644d1ef68df6181b26 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -25,7 +25,7 @@
 **     ROLLBACK
 **     PRAGMA
 **
-** $Id: build.c,v 1.129 2003/02/12 14:09:44 drh Exp $
+** $Id: build.c,v 1.130 2003/02/26 13:52:51 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -606,12 +606,12 @@ void sqliteAddPrimaryKey(Parse *pParse, IdList *pList, int onError){
   Table *pTab = pParse->pNewTable;
   char *zType = 0;
   int iCol = -1;
-  if( pTab==0 ) return;
+  if( pTab==0 ) goto primary_key_exit;
   if( pTab->hasPrimKey ){
     sqliteSetString(&pParse->zErrMsg, "table \"", pTab->zName, 
         "\" has more than one primary key", 0);
     pParse->nErr++;
-    return;
+    goto primary_key_exit;
   }
   pTab->hasPrimKey = 1;
   if( pList==0 ){
@@ -630,7 +630,12 @@ void sqliteAddPrimaryKey(Parse *pParse, IdList *pList, int onError){
     pTab->keyConf = onError;
   }else{
     sqliteCreateIndex(pParse, 0, 0, pList, onError, 0, 0);
+    pList = 0;
   }
+
+primary_key_exit:
+  sqliteIdListDelete(pList);
+  return;
 }
 
 /*

diff --git a/test/conflict.test b/test/conflict.test
index 558dd5c2aa2c4751f273b81fc3d2d6958b2b12d0..66678ef65d48cafd4b60ec10bcc9a8ecce84a540 100644 (file)
--- a/test/conflict.test
+++ b/test/conflict.test
@@ -13,7 +13,7 @@
 # This file implements tests for the conflict resolution extension
 # to SQLite.
 #
-# $Id: conflict.test,v 1.15 2003/01/29 18:46:54 drh Exp $
+# $Id: conflict.test,v 1.16 2003/02/26 13:52:52 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -138,7 +138,7 @@ do_test conflict-3.0 {
   execsql {
     DROP TABLE t1;
     DROP TABLE t2;
-    CREATE TABLE t1(a, b, c INTEGER PRIMARY KEY, UNIQUE(a,b));
+    CREATE TABLE t1(a, b, c INTEGER, PRIMARY KEY(c), UNIQUE(a,b));
     CREATE TABLE t2(x);
     SELECT c FROM t1 ORDER BY c;
   }

diff --git a/test/memleak.test b/test/memleak.test
index d2bcb7c92338924f5c5617d3a91cd0bf559da552..5d1de7abc16ecd51444c0af8c159c50d70b8d833 100644 (file)
--- a/test/memleak.test
+++ b/test/memleak.test
@@ -10,7 +10,7 @@
 #***********************************************************************
 # This file runs all tests.
 #
-# $Id: memleak.test,v 1.1 2002/08/31 16:52:45 drh Exp $
+# $Id: memleak.test,v 1.2 2003/02/26 13:52:52 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -41,8 +41,14 @@ set EXCLUDE {
   btree2.test
   trans.test
 }
+if {[llength $argv]>0} {
+  set FILELIST $argv
+  set argv {}
+} else {
+  set FILELIST [lsort -dictionary [glob $testdir/*.test]]
+}
 
-foreach testfile [lsort -dictionary [glob $testdir/*.test]] {
+foreach testfile $FILELIST {
   set tail [file tail $testfile]
   if {[lsearch -exact $EXCLUDE $tail]>=0} continue
   set LeakList {}

diff --git a/test/misc1.test b/test/misc1.test
index e6063f608542299608db0c1906348f0aecad7263..cf14021897f0c1d481e94c49c7e6610847bb14c1 100644 (file)
--- a/test/misc1.test
+++ b/test/misc1.test
@@ -13,7 +13,7 @@
 # This file implements tests for miscellanous features that were
 # left out of other test files.
 #
-# $Id: misc1.test,v 1.20 2003/02/01 13:53:28 drh Exp $
+# $Id: misc1.test,v 1.21 2003/02/26 13:52:52 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -480,4 +480,44 @@ do_test misc1-15.2 {
   # the error "table t10 alread exists"
 } {0 {}}
 
+# Test for memory leaks when a CREATE TABLE containing a primary key
+# fails.  Ticket #249.
+#
+do_test misc1-16.1 {
+  catchsql {SELECT name FROM sqlite_master LIMIT 1}
+  catchsql {
+    CREATE TABLE test(a integer, primary key(a));
+  }
+} {0 {}}
+do_test misc1-16.2 {
+  catchsql {
+    CREATE TABLE test(a integer, primary key(a));
+  }
+} {1 {table test already exists}}
+do_test misc1-16.3 {
+  catchsql {
+    CREATE TABLE test2(a text primary key, b text, primary key(a,b));
+  }
+} {1 {table "test2" has more than one primary key}}
+do_test misc1-16.4 {
+  execsql {
+    INSERT INTO test VALUES(1);
+    SELECT rowid, a FROM test;
+  }
+} {1 1}
+do_test misc1-16.5 {
+  execsql {
+    INSERT INTO test VALUES(5);
+    SELECT rowid, a FROM test;
+  }
+} {1 1 5 5}
+do_test misc1-16.6 {
+  execsql {
+    INSERT INTO test VALUES(NULL);
+    SELECT rowid, a FROM test;
+  }
+} {1 1 5 5 6 6}
+
+
+
 finish_test