From: dan <dan@noemail.net>
Date: Tue, 24 Nov 2020 17:55:34 +0000 (+0000)
Subject: Fix a bug in OOM handling code introduced by [6a28713d].
X-Git-Tag: version-3.34.0~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f5c3a75b637d4b67fdc2c727d4efc21f60f08acf;p=thirdparty%2Fsqlite.git

Fix a bug in OOM handling code introduced by [6a28713d].

FossilOrigin-Name: 8a786ce99491401dd7660e54f1a1ba3b2300cecbe180b1a31e549ff5f5b77bdc
---

diff --git a/manifest b/manifest
index b09ea33aa2..c898a50cdd 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\ssuper-journal\sand\sother\sjournal\sfilenames\spassed\sby\sSQLite\sto\san\ssqlite3_vfs.xOpen()\simplementation\smay\sbe\ssafely\spassed\sto\ssqlite3_uri_parameter()\sand\ssimilar\sfunctions.
-D 2020-11-24T16:44:09.691
+C Fix\sa\sbug\sin\sOOM\shandling\scode\sintroduced\sby\s[6a28713d].
+D 2020-11-24T17:55:34.487
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -526,7 +526,7 @@ F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 F src/os_unix.c adbbcea4c63d3b400d405f60a5da4c01433753ec4a12e2dc695beb2bbd671fe9
 F src/os_win.c 77d39873836f1831a9b0b91894fec45ab0e9ca8e067dc8c549e1d1eca1566fe9
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
-F src/pager.c abad00616c86498159e817f44eb8d459d81ce9f2c3c9e38adfd7d354aa521df7
+F src/pager.c c49952ac5e9cc536778eff528091d79d38b3e45cbeeed4695dc05e207dc6547d
 F src/pager.h 4bf9b3213a4b2bebbced5eaa8b219cf25d4a82f385d093cd64b7e93e5285f66f
 F src/parse.y 9ce4dfb772608ed5bd3c32f33e943e021e3b06cfd2c01932d4280888fdd2ebed
 F src/pcache.c 385ff064bca69789d199a98e2169445dc16e4291fa807babd61d4890c3b34177
@@ -1886,7 +1886,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 5466dd55d4aa15fd96f00b6e205dfb868879357a476df7ffd29b97bb570629a5
-R 32be1cbc6f93fed343ef5cfb6f785cd6
+P 6a28713d59cde0882c3508160347c2ea18c7c4e9bfd1b053103af2d5e12a144c
+R c5ce126c57613764a5fb86a0f61f6a6e
 U dan
-Z edd6dd37f1d36c213572a037d65e2e50
+Z 0a658712acd4eef927d03df3f7f8749d
diff --git a/manifest.uuid b/manifest.uuid
index f3a4bc0f31..26cceda787 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6a28713d59cde0882c3508160347c2ea18c7c4e9bfd1b053103af2d5e12a144c
\ No newline at end of file
+8a786ce99491401dd7660e54f1a1ba3b2300cecbe180b1a31e549ff5f5b77bdc
\ No newline at end of file
diff --git a/src/pager.c b/src/pager.c
index dbbcc4a258..a5510e7eb8 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -2512,12 +2512,12 @@ static int pager_delsuper(Pager *pPager, const char *zSuper){
   if( rc!=SQLITE_OK ) goto delsuper_out;
   nSuperPtr = pVfs->mxPathname+1;
   zFree = sqlite3Malloc(4 + nSuperJournal + nSuperPtr + 2);
-  zFree[0] = zFree[1] = zFree[2] = zFree[3] = 0;
-  zSuperJournal = &zFree[4];
-  if( !zSuperJournal ){
+  if( !zFree ){
     rc = SQLITE_NOMEM_BKPT;
     goto delsuper_out;
   }
+  zFree[0] = zFree[1] = zFree[2] = zFree[3] = 0;
+  zSuperJournal = &zFree[4];
   zSuperPtr = &zSuperJournal[nSuperJournal+2];
   rc = sqlite3OsRead(pSuper, zSuperJournal, (int)nSuperJournal, 0);
   if( rc!=SQLITE_OK ) goto delsuper_out;