From: drh <drh@noemail.net>
Date: Fri, 10 May 2019 14:34:18 +0000 (+0000)
Subject: Ensure that the BtShared.nPage value is reset correctly on a SAVEPOINT
X-Git-Tag: version-3.29.0~111
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=41422656450bed94abee2edf1df83660325afc5c;p=thirdparty%2Fsqlite.git

Ensure that the BtShared.nPage value is reset correctly on a SAVEPOINT
ROLLBACK.

FossilOrigin-Name: e6d5fee8cdbdce8515957e8288e4d1e7b06f417fd3f9deeeb636fbf5b995af51
---

diff --git a/manifest b/manifest
index 5e85198239..0b1618cd64 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Treat\sinteger\svalues\sin\swindow\sdefinition\sORDER\sBY\sclauses\sas\sconstants,\snot\sas\sreferences\sto\sanother\sexpression.
-D 2019-05-10T14:26:32.252
+C Ensure\sthat\sthe\sBtShared.nPage\svalue\sis\sreset\scorrectly\son\sa\sSAVEPOINT\s\nROLLBACK.
+D 2019-05-10T14:34:18.772
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -462,7 +462,7 @@ F src/auth.c 0fac71038875693a937e506bceb492c5f136dd7b1249fbd4ae70b4e8da14f9df
 F src/backup.c b1d37f6f7f5913944583733ed0f9e182f3ece0d42c27f46701142141a6e6fd33
 F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
-F src/btree.c 0a276df3f912569bb8a5aac31af333dd238a72dc8e506f590555d68b2885f98e
+F src/btree.c 5e15f903fd44b076b864a8d2449d63b44a546efabb66fca7dfed90f106f5c756
 F src/btree.h c11446f07ec0e9dc85af8041cb0855c52f5359c8b2a43e47e02a685282504d89
 F src/btreeInt.h 6111c15868b90669f79081039d19e7ea8674013f907710baa3c814dc3f8bfd3f
 F src/build.c 23e9332b260cd0e45f6cbfabe711957a0776ea3ff836746378868fdfa64d267b
@@ -1002,7 +1002,7 @@ F test/fuzzdata4.db b502c7d5498261715812dd8b3c2005bad08b3a26e6489414bd13926cd3e4
 F test/fuzzdata5.db e35f64af17ec48926481cfaf3b3855e436bd40d1cfe2d59a9474cb4b748a52a5
 F test/fuzzdata6.db 92a80e4afc172c24f662a10a612d188fb272de4a9bd19e017927c95f737de6d7
 F test/fuzzdata7.db 2b13f8d7a4e475f164c733e64c9ebc459424ec58d0876ef103de62c1a99e2fca
-F test/fuzzdata8.db 7f1ad0a0cc9918529e7b16f48f2449ce6e7871babd71c79492bbe020fb3a63ae
+F test/fuzzdata8.db 038627908808f88bad9c3ac90f3b7865766f92b2cfed585c7e083a792d554ade
 F test/fuzzer1.test 3d4c4b7e547aba5e5511a2991e3e3d07166cfbb8
 F test/fuzzer2.test a85ef814ce071293bce1ad8dffa217cbbaad4c14
 F test/fuzzerfault.test 8792cd77fd5bce765b05d0c8e01b9edcf8af8536
@@ -1825,7 +1825,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 e80b2d9fcbc82ae5dc8a1fc13196f9a30bdb504eb5a5c131d136a78bbd5bbe7b
-R 5d10e80b168be165319a3925a198d45f
-U dan
-Z 3dc3f887bf15d65a8af6e96bb64729d0
+P 7e4809eadfe99ebfd797a7c63501421021a720bbeed9fba81bebf630c58bb791
+R 268b58938fd6d4d4d8851725d5098438
+U drh
+Z 721183bcdc81f44fe0374ed072896b4f
diff --git a/manifest.uuid b/manifest.uuid
index b22fb68e87..2320774bf9 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7e4809eadfe99ebfd797a7c63501421021a720bbeed9fba81bebf630c58bb791
\ No newline at end of file
+e6d5fee8cdbdce8515957e8288e4d1e7b06f417fd3f9deeeb636fbf5b995af51
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index 2b322122a8..47c5dd9f70 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -4153,6 +4153,18 @@ int sqlite3BtreeTripAllCursors(Btree *pBtree, int errCode, int writeOnly){
   return rc;
 }
 
+/*
+** Set the pBt->nPage field correctly, according to the current
+** state of the database.  Assume pBt->pPage1 is valid.
+*/
+static void btreeSetNPage(BtShared *pBt, MemPage *pPage1){
+  int nPage = get4byte(&pPage1->aData[28]);
+  testcase( nPage==0 );
+  if( nPage==0 ) sqlite3PagerPagecount(pBt->pPager, &nPage);
+  testcase( pBt->nPage!=nPage );
+  pBt->nPage = nPage;
+}
+
 /*
 ** Rollback the transaction in progress.
 **
@@ -4198,11 +4210,7 @@ int sqlite3BtreeRollback(Btree *p, int tripCode, int writeOnly){
     ** call btreeGetPage() on page 1 again to make
     ** sure pPage1->aData is set correctly. */
     if( btreeGetPage(pBt, 1, &pPage1, 0)==SQLITE_OK ){
-      int nPage = get4byte(28+(u8*)pPage1->aData);
-      testcase( nPage==0 );
-      if( nPage==0 ) sqlite3PagerPagecount(pBt->pPager, &nPage);
-      testcase( pBt->nPage!=nPage );
-      pBt->nPage = nPage;
+      btreeSetNPage(pBt, pPage1);
       releasePageOne(pPage1);
     }
     assert( countValidCursors(pBt, 1)==0 );
@@ -4282,7 +4290,7 @@ int sqlite3BtreeSavepoint(Btree *p, int op, int iSavepoint){
         pBt->nPage = 0;
       }
       rc = newDatabase(pBt);
-      pBt->nPage = get4byte(28 + pBt->pPage1->aData);
+      btreeSetNPage(pBt, pBt->pPage1);
 
       /* pBt->nPage might be zero if the database was corrupt when 
       ** the transaction was started. Otherwise, it must be at least 1.  */
diff --git a/test/fuzzdata8.db b/test/fuzzdata8.db
index b6440aa3cc..1a7ef8bb92 100644
Binary files a/test/fuzzdata8.db and b/test/fuzzdata8.db differ