From: dan <Dan Kennedy>
Date: Fri, 2 Sep 2022 21:19:24 +0000 (+0000)
Subject: Ensure the Pager.journalOff variable is zeroed if an error occurs while writing the... 
X-Git-Tag: version-3.40.0~209
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ad617b4d6d508486a04b17bf6ac315b1b20aa94f;p=thirdparty%2Fsqlite.git

Ensure the Pager.journalOff variable is zeroed if an error occurs while writing the initial header to the journal file.

FossilOrigin-Name: da7af290960ab8a04a1f55cdc5eeac36b47fa194edf67f0a05daa4b7f2a4071c
---

diff --git a/manifest b/manifest
index 6d5a66eef8..d7b1deb4ae 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sassert()\sassociated\swith\sthe\sdbsqlfuzz\serror\sat\s[8372468bb5d8922c].
-D 2022-09-02T17:25:25.196
+C Ensure\sthe\sPager.journalOff\svariable\sis\szeroed\sif\san\serror\soccurs\swhile\swriting\sthe\sinitial\sheader\sto\sthe\sjournal\sfile.
+D 2022-09-02T21:19:24.442
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -575,7 +575,7 @@ F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 F src/os_unix.c 102f7e5c5b59c18ea3dbc929dc3be8acb3afc0e0b6ad572e032335c9c27f44f1
 F src/os_win.c d55025aeb5b36b5d92d7c09fe709edaf2be901420782540ba4adad86729636a0
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
-F src/pager.c c60031c483960660853dfecf14c8e830503baab1f638ac997f0144f1bd3e1781
+F src/pager.c 6176d9752eb580419e8fef4592dc417a6b00ddfd43ee22f818819bf8840ceee8
 F src/pager.h f82e9844166e1585f5786837ddc7709966138ced17f568c16af7ccf946c2baa3
 F src/parse.y 8e67d820030d2655b9942ffe61c1e7e6b96cea2f2f72183533299393907d0564
 F src/pcache.c 22a6ebe498d1d26c85fd1e3bcb246d97b882c060027c1e1688fbea905f5ac3cf
@@ -1999,8 +1999,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 81cff9f1955874aade55daa94263f58f06d966bd51ad558755f92777069a7347
-R e3f3854237e6ccbd24e5faf8a81d6554
-U drh
-Z 5ecc0e1668a222228dc4637f535ad91a
+P 54251f81ebc43839cc97f91d2df4c320c1b96b5690cc11ce45b60c087c9becd6
+R 87dafa73318986b955e7b84411151a61
+U dan
+Z acee053f656d75b425260930781b7440
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index fce2af451d..d002876e21 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-54251f81ebc43839cc97f91d2df4c320c1b96b5690cc11ce45b60c087c9becd6
\ No newline at end of file
+da7af290960ab8a04a1f55cdc5eeac36b47fa194edf67f0a05daa4b7f2a4071c
\ No newline at end of file
diff --git a/src/pager.c b/src/pager.c
index ca406b8c5d..883e6532cf 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -5822,6 +5822,7 @@ static int pager_open_journal(Pager *pPager){
   if( rc!=SQLITE_OK ){
     sqlite3BitvecDestroy(pPager->pInJournal);
     pPager->pInJournal = 0;
+    pPager->journalOff = 0;
   }else{
     assert( pPager->eState==PAGER_WRITER_LOCKED );
     pPager->eState = PAGER_WRITER_CACHEMOD;