From: dan <dan@noemail.net>
Date: Sat, 31 Dec 2011 10:18:00 +0000 (+0000)
Subject: Add calls to the BenignMalloc() functions around the SQLITE_FCNTL_OVERWRITE call... 
X-Git-Tag: version-3.7.10~19^2~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=23a3de398e2a816a402a603532edb3da42026f1d;p=thirdparty%2Fsqlite.git

Add calls to the BenignMalloc() functions around the SQLITE_FCNTL_OVERWRITE call in backup.c.

FossilOrigin-Name: 3e0833dbb736a1aca08d17941d6d33901b15a03b
---

diff --git a/manifest b/manifest
index 1765dba345..24265fbbb2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\scalls\sto\sthe\sBenignMalloc()\sfunctions\saround\sthe\sSQLITE_FCNTL_SIZE_HINT\scall\sin\spager.c.
-D 2011-12-30T18:16:02.598
+C Add\scalls\sto\sthe\sBenignMalloc()\sfunctions\saround\sthe\sSQLITE_FCNTL_OVERWRITE\scall\sin\sbackup.c.
+D 2011-12-31T10:18:00.048
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -122,7 +122,7 @@ F src/alter.c ac80a0f31189f8b4a524ebf661e47e84536ee7f5
 F src/analyze.c f32ff304da413851eefa562b04e61ff6cb88248b
 F src/attach.c 12c6957996908edc31c96d7c68d4942c2474405f
 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
-F src/backup.c 4368158da74d4711888e03264105c5c527d76caf
+F src/backup.c 80d713109d295cc3a674f55cfe6446afb9b024ad
 F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
 F src/btree.c 2fdde7d16c80bd4e8a0913038e766c4297818f6f
@@ -986,7 +986,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 46e7903ab993b08251c87239bd4a7320e6781cee
-R f1370d9592311ee925b065af7c5e925d
+P c17a3f5e5d72187c06b598ef071d43ef89328e19
+R 11347eca51418811296406b6ca6391d4
 U dan
-Z 7b10c47157901b03eeddf5ba0f182b05
+Z e290df4c733c56ee941822f3e8c85381
diff --git a/manifest.uuid b/manifest.uuid
index d74ef398bd..8ffd3352f9 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c17a3f5e5d72187c06b598ef071d43ef89328e19
\ No newline at end of file
+3e0833dbb736a1aca08d17941d6d33901b15a03b
\ No newline at end of file
diff --git a/src/backup.c b/src/backup.c
index bdf96bd8e1..f3b952bf0d 100644
--- a/src/backup.c
+++ b/src/backup.c
@@ -678,7 +678,9 @@ int sqlite3BtreeCopyFile(Btree *pTo, Btree *pFrom){
   pFd = sqlite3PagerFile(sqlite3BtreePager(pTo));
   if( pFd->pMethods ){
     i64 nByte = sqlite3BtreeGetPageSize(pFrom)*(i64)sqlite3BtreeLastPage(pFrom);
+    sqlite3BeginBenignMalloc();
     sqlite3OsFileControl(pFd, SQLITE_FCNTL_OVERWRITE, &nByte);
+    sqlite3EndBenignMalloc();
   }
 
   /* Set up an sqlite3_backup object. sqlite3_backup.pDestDb must be set