Fix a (benign) valgrind error that can occur following malloc failure while executing...

FossilOrigin-Name: 9ff8598f3be123a244f71b45e77af913b836504a

diff --git a/manifest b/manifest
index ffb9ababc2a53639db6c9ae214567174e263fb7f..1e5a1e110844db689c717c8e7e234293e8d331c0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\ssome\sproblems\sin\sthe\sfts3\sexpression\sparser\swith\smismatched\sparenthesis.\s(CVS\s6095)
-D 2009-01-01T14:06:13
+C Fix\sa\s(benign)\svalgrind\serror\sthat\scan\soccur\sfollowing\smalloc\sfailure\swhile\sexecuting\sa\s'ROLLBACK\sTO\ssavepoint'\scommand.\s(CVS\s6096)
+D 2009-01-01T15:20:37
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 77635d0909c2067cee03889a1e04ce910d8fb809
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -142,7 +142,7 @@ F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
 F src/os_os2.c bed77dc26e3a95ce4a204936b9a1ca6fe612fcc5
 F src/os_unix.c e6eacc7ec735ded605fefcbaf250058baa8feb12
 F src/os_win.c 496e3ceb499aedc63622a89ef76f7af2dd902709
-F src/pager.c ec486337fae32dfcaac41f4471c70a0385fe8487
+F src/pager.c 1610863d7c1b63d3365f7735dfedd91d8c05c382
 F src/pager.h 0579740d4c18826b46124c82330467b41f407eb1
 F src/parse.y 4d0e33a702dc3ea7b69d8ae1914b3fbd32e46057
 F src/pcache.c 16dc8da6e6ba6250f8dfd9ee46036db1cbceedc6
@@ -495,7 +495,7 @@ F test/rtree.test b85fd4f0861a40ca366ac195e363be2528dcfadf
 F test/safety.test b69e2b2dd5d52a3f78e216967086884bbc1a09c6
 F test/savepoint.test 08803877993d11cfbe3bbbaf811822e068a2dd8b
 F test/savepoint2.test 18f6c75d5c133b93838019df8988b8cdf379d3de
-F test/savepoint3.test b3c9aa5af3f777ccb8b9e15597c75c93eb5bc369
+F test/savepoint3.test 1a0b1c0f59c6ae4402bfbca7cec29d4b1b272ff0
 F test/savepoint4.test fd8850063e3c40565545f5c291e7f79a30591670
 F test/schema.test a8b000723375fd42c68d310091bdbd744fde647c
 F test/schema2.test 35e1c9696443d6694c8980c411497c2b5190d32e
@@ -690,7 +690,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P afac4293000f81410d105a99956605bf7102fa62
-R f564cdb23ce64284d1cd04ffdf2d252b
+P ccfe4580ac7ba9add0e69c786a9a3a43d69b7753
+R 55e5da6452ac7bf13b968c8f36ed538b
 U danielk1977
-Z 30d6e7707b897d722bc973a70461e5a8
+Z fe12888ee4a3f9d606558994dc2f8d82

diff --git a/manifest.uuid b/manifest.uuid
index 099859e0c373d38338cff9175180d3a4cae87972..e0fe1155c17d1be50ad1e1a8fba09735528dda65 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ccfe4580ac7ba9add0e69c786a9a3a43d69b7753
\ No newline at end of file
+9ff8598f3be123a244f71b45e77af913b836504a
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index ac42d13ff51dee60df3da3ff392d294443bb6a0f..fe344e76784facf6208aadb59b5ee958f91d3d1d 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -18,7 +18,7 @@
 ** file simultaneously, or one process from reading the database while
 ** another is writing.
 **
-** @(#) $Id: pager.c,v 1.524 2008/12/27 15:23:13 danielk1977 Exp $
+** @(#) $Id: pager.c,v 1.525 2009/01/01 15:20:37 danielk1977 Exp $
 */
 #ifndef SQLITE_OMIT_DISKIO
 #include "sqliteInt.h"
@@ -1696,7 +1696,7 @@ static int pagerPlaybackSavepoint(Pager *pPager, PagerSavepoint *pSavepoint){
     pPager->journalOff = 0;
   }
   while( rc==SQLITE_OK && pPager->journalOff<szJ ){
-    u32 nJRec;         /* Number of Journal Records */
+    u32 nJRec = 0;     /* Number of Journal Records */
     u32 dummy;
     rc = readJournalHdr(pPager, szJ, &nJRec, &dummy);
     assert( rc!=SQLITE_DONE );

diff --git a/test/savepoint3.test b/test/savepoint3.test
index 9ef318f9cc06fc8d13da968b786a9b1e66658c35..6af51fbb429c3508dbd48c009545f1966742bed1 100644 (file)
--- a/test/savepoint3.test
+++ b/test/savepoint3.test
@@ -9,7 +9,7 @@
 #
 #***********************************************************************
 #
-# $Id: savepoint3.test,v 1.1 2008/12/18 18:31:39 danielk1977 Exp $
+# $Id: savepoint3.test,v 1.2 2009/01/01 15:20:37 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -28,7 +28,7 @@ do_malloc_test savepoint3-1 -sqlprep {
   RELEASE one;
 }
 
-do_malloc_test savepoint3-1 -sqlprep {
+do_malloc_test savepoint3-2 -sqlprep {
   PRAGMA cache_size = 10;
   CREATE TABLE t1(a, b, c);
   INSERT INTO t1 VALUES(randstr(400,400), randstr(400,400), randstr(400,400));