From: dan <dan@noemail.net>
Date: Mon, 9 Aug 2010 16:12:51 +0000 (+0000)
Subject: Fix a memory leak in test_journal.c causing tests to fail.
X-Git-Tag: version-3.7.2~53^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5198bead7ab8ef007af9c7902084c4b5fc652df8;p=thirdparty%2Fsqlite.git

Fix a memory leak in test_journal.c causing tests to fail.

FossilOrigin-Name: f229487cccc7514b2663e8e6e04798702c9cfb10
---

diff --git a/manifest b/manifest
index d49f525643..8b71df0195 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sto\stcl\stest\sinfrastructure\sso\sthat\s--malloctrace=1\sworks\swhen\ssizeof(int)!=sizeof(void*).
-D 2010-08-09T14:47:50
+C Fix\sa\smemory\sleak\sin\stest_journal.c\scausing\stests\sto\sfail.
+D 2010-08-09T16:12:52
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -156,7 +156,7 @@ F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
 F src/os_os2.c 72d0b2e562952a2464308c4ce5f7913ac10bef3e
 F src/os_unix.c ae5ca8a6031380708f3fec7be325233d49944914
 F src/os_win.c 51cb62f76262d961ea4249489383d714501315a7
-F src/pager.c 3af4caaa32f26d537ff857ac30d3ac3ce7e46ea5
+F src/pager.c ad850e0b0547ff3781676c311c276123b5e07902
 F src/pager.h 80726162dc3942f59ab27b738fb667b9ba0a89d5
 F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
 F src/pcache.c 1e9aa2dbc0845b52e1b51cc39753b6d1e041cb07
@@ -198,7 +198,7 @@ F src/test_hexio.c 1237f000ec7a491009b1233f5c626ea71bce1ea2
 F src/test_init.c 5d624ffd0409d424cf9adbfe1f056b200270077c
 F src/test_intarray.c d879bbf8e4ce085ab966d1f3c896a7c8b4f5fc99
 F src/test_intarray.h 489edb9068bb926583445cb02589344961054207
-F src/test_journal.c 5ac89727cadbcc71954067b319eb40aff71dead2
+F src/test_journal.c 785edd54f963aefb3c1628124170a56697c68c70
 F src/test_loadext.c df586c27176e3c2cb2e099c78da67bf14379a56e
 F src/test_malloc.c 09a88f0c111201dc4f8c20470aa1b5f611d59200
 F src/test_mutex.c ce06b59aca168cd8c520b77159a24352a7469bd3
@@ -843,7 +843,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P f1b2b5f9c3a5561ea6108283ae08404106c3f8bc
-R 0c13ff5ef493cf88f58734e32a21c9d6
+P c3e771b3cf685f4237a2516ee7111849bf0ffb3f
+R fafdcc6c6bb38040ee797c40ede9da75
 U dan
-Z 48ba547a168a1ffe5803ea79aa90257c
+Z 19e4a407fe616523b7236ad07579dec7
diff --git a/manifest.uuid b/manifest.uuid
index 9547915834..55a281afff 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c3e771b3cf685f4237a2516ee7111849bf0ffb3f
\ No newline at end of file
+f229487cccc7514b2663e8e6e04798702c9cfb10
\ No newline at end of file
diff --git a/src/pager.c b/src/pager.c
index b68d3cbb8f..4c5bd662cd 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -901,7 +901,7 @@ static char *print_pager_state(Pager *p){
         p->eState==PAGER_WRITER_FINISHED ? "WRITER_FINISHED" :
         p->eState==PAGER_ERROR           ? "ERROR" : "?error?"
       , (int)p->errCode
-      , p->eLock==NO_LOCK         ? "OPEN" :
+      , p->eLock==NO_LOCK         ? "NO_LOCK" :
         p->eLock==RESERVED_LOCK   ? "RESERVED" :
         p->eLock==EXCLUSIVE_LOCK  ? "EXCLUSIVE" :
         p->eLock==SHARED_LOCK     ? "SHARED" :
diff --git a/src/test_journal.c b/src/test_journal.c
index 0300fb8716..ca4c5c3884 100644
--- a/src/test_journal.c
+++ b/src/test_journal.c
@@ -361,6 +361,7 @@ static int openTransaction(jt_file *pMain, jt_file *pJournal){
   sqlite3_file *p = pMain->pReal;
   int rc = SQLITE_OK;
 
+  closeTransaction(pMain);
   aData = sqlite3_malloc(pMain->nPagesize);
   pMain->pWritable = sqlite3BitvecCreate(pMain->nPage);
   pMain->aCksum = sqlite3_malloc(sizeof(u32) * (pMain->nPage + 1));