Ignore malloc failures within the WAL file truncation attempt for

journal_size_limit.

FossilOrigin-Name: dd19105aa9521ffc0edcf16b84c064d5ebad55d7

diff --git a/manifest b/manifest
index 1074285b3f6c8ed02067f26de92ac7ef8175b448..bd65c3d5e3e5c399106167a777b198d4e43afc3a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\scase\swhere\sa\smalloc()\serror\scould\slead\sto\smismatched\svirtual-table\sxBegin/xCommit/xRollback\scallbacks.
-D 2011-05-25T18:46:22.024
+C Ignore\smalloc\sfailures\swithin\sthe\sWAL\sfile\struncation\sattempt\sfor\njournal_size_limit.
+D 2011-05-25T20:25:10.559
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 11dcc00a8d0e5202def00e81732784fb0cc4fe1d
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -245,7 +245,7 @@ F src/vdbeblob.c c3ccb7c8732858c680f442932e66ad06bb036562
 F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
 F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
 F src/vtab.c 9ba8c7fdb7d39260c033a402f6032d3e7bc5d336
-F src/wal.c de27c34c8016c00be348fc6bed588816557ceb66
+F src/wal.c ab1d8c5abf904fd6396f90499cbd8c54b8d6961b
 F src/wal.h 66b40bd91bc29a5be1c88ddd1f5ade8f3f48728a
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
 F src/where.c 55403ce19c506be6a321c7f129aff693d6103db5
@@ -938,7 +938,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 6df99e52dabf2a243ad635529649b86c21735e91
-R 02c26b8fd230a540c57276590c974e79
-U dan
-Z e2a23225f8e5abceac6a8fe1d14982ec
+P d807304a695fc85402b86e1cd32a6e3bbb2823c8
+R 40f4c0754c95b7a51c08aa03886ff26c
+U drh
+Z c74bad4333e073e26c4db5e166f8f584

diff --git a/manifest.uuid b/manifest.uuid
index 5b49fb4d2dce86ce9633f1f35606138bf2629505..f139bfb8f7d61c00f20403c1359545f0c9e9c185 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d807304a695fc85402b86e1cd32a6e3bbb2823c8
\ No newline at end of file
+dd19105aa9521ffc0edcf16b84c064d5ebad55d7
\ No newline at end of file

diff --git a/src/wal.c b/src/wal.c
index 1222660985b6bc04bd275b31f2f5fac2693bd908..d90fb05d8b9b258234c7c3be7a73fa936bb0e757 100644 (file)
--- a/src/wal.c
+++ b/src/wal.c
@@ -2539,10 +2539,12 @@ static int walRestartLog(Wal *pWal){
         if( pWal->mxWalSize>=0 ){
           i64 sz;
           int rx;
+          sqlite3BeginBenignMalloc();
           rx = sqlite3OsFileSize(pWal->pWalFd, &sz);
           if( rx==SQLITE_OK && (sz > pWal->mxWalSize) ){
             rx = sqlite3OsTruncate(pWal->pWalFd, pWal->mxWalSize);
           }
+          sqlite3EndBenignMalloc();
           if( rx ){
             sqlite3_log(rx, "cannot limit WAL size: %s", pWal->zWalName);
           }