Ensure that the Pager.pTmpSpace allocation is correct even if an OOM error

occurs while reducing the page size.

FossilOrigin-Name: e4b43967fd9a0b4944be9ab5575bff3678be8ed5

diff --git a/manifest b/manifest
index 61a2a2395094b7c41a8b1e71c2dcbd2cf686baa7..2d5dcf21ef13e4505aba298e9b459c0faaf3dc5f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\ssome\stemporary\scode\sin\smallocA.test\sthat\swas\saccidentally\schecked\sin.
-D 2014-10-08T11:11:24.999
+C Ensure\sthat\sthe\sPager.pTmpSpace\sallocation\sis\scorrect\seven\sif\san\sOOM\serror\noccurs\swhile\sreducing\sthe\spage\ssize.
+D 2014-10-08T13:34:21.522
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -215,7 +215,7 @@ F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 F src/os_unix.c fb587121840f690101336879adfa6d0b2cd0e8c7
 F src/os_win.c 0a4042ef35f322e86fa01f6c8884c5e645b911e7
 F src/os_win.h 09e751b20bbc107ffbd46e13555dc73576d88e21
-F src/pager.c caab007743821d96752597c9cfd7351654697b06
+F src/pager.c a171cf9dd09c6cb162b262c328d4dfd198e04f80
 F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
 F src/parse.y 5dfead8aed90cb0c7c1115898ee2266804daff45
 F src/pcache.c 4121a0571c18581ee9f82f086d5e2030051ebd6a
@@ -1203,7 +1203,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P e3fe84005259ef9a6027d25793514cebb2d4e7e0
-R 041f735fd7729856664b7e587c89b3dc
-U dan
-Z 7e47868b81dfec753c3dcd2a3c6c6ccd
+P dedd15f7cd13868f3be37646dd30ab7ceac5dea7
+R 4cf08d774ef596973588c752956e991d
+U drh
+Z e3bcbea265a57269fe808fe62b242441

diff --git a/manifest.uuid b/manifest.uuid
index 0fb51d4d964870c70db1ac865c3f3b258497906c..b199078c318871e35137679bfc88f65a0e6f0802 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dedd15f7cd13868f3be37646dd30ab7ceac5dea7
\ No newline at end of file
+e4b43967fd9a0b4944be9ab5575bff3678be8ed5
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index 79bfe15f10b7dce3a87e2a7f5ba6a6f57f0a239d..d3a36ef4842960c2c766a2c1fcf875124aee1427 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -3618,13 +3618,15 @@ int sqlite3PagerSetPagesize(Pager *pPager, u32 *pPageSize, int nReserve){
 
     if( rc==SQLITE_OK ){
       pager_reset(pPager);
-      sqlite3PageFree(pPager->pTmpSpace);
-      pPager->pTmpSpace = pNew;
       rc = sqlite3PcacheSetPageSize(pPager->pPCache, pageSize);
     }
     if( rc==SQLITE_OK ){
+      sqlite3PageFree(pPager->pTmpSpace);
+      pPager->pTmpSpace = pNew;
       pPager->dbSize = (Pgno)((nByte+pageSize-1)/pageSize);
       pPager->pageSize = pageSize;
+    }else{
+      sqlite3PageFree(pNew);
     }
   }