Ensure an sqlite_dbdata cursor is properly reset before being used again, even if...

FossilOrigin-Name: 3210e1ca4d0efedf9710c97abd050ba10d3af98cb1f029c26daa84daf42fbc7e

diff --git a/ext/recover/dbdata.c b/ext/recover/dbdata.c
index a999f1a853a79c0bbecbfea8e3158f0b07d41341..109aeef2d610babecb848da396e2308aedbec705 100644 (file)
--- a/ext/recover/dbdata.c
+++ b/ext/recover/dbdata.c
@@ -325,6 +325,7 @@ static void dbdataResetCursor(DbdataCursor *pCsr){
   sqlite3_free(pCsr->aPage);
   dbdataBufferFree(&pCsr->rec);
   pCsr->aPage = 0;
+  pCsr->nRec = 0;
 }
 
 /*
@@ -596,6 +597,7 @@ static int dbdataNext(sqlite3_vtab_cursor *pCursor){
       }
     }else{
       /* If there is no record loaded, load it now. */
+      assert( pCsr->rec.aBuf!=0 || pCsr->nRec==0 );
       if( pCsr->nRec==0 ){
         int bHasRowid = 0;
         int nPointer = 0;

diff --git a/manifest b/manifest
index 20bade802bde99330f53faa8ebe924331af15193..42c7c3296ec284c5979ed1c441d013eea3114017 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sattempt\sto\srun\smmapcorrupt.test\swith\sbuilds\sthat\sdo\snot\ssupport\smmap().
-D 2024-05-21T14:54:46.724
+C Ensure\san\ssqlite_dbdata\scursor\sis\sproperly\sreset\sbefore\sbeing\sused\sagain,\seven\sif\sit\shas\salready\sencountered\sdatabase\scorruption.
+D 2024-05-21T17:37:50.943
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -478,7 +478,7 @@ F ext/rbu/rbuvacuum4.test ffccd22f67e2d0b380d2889685742159dfe0d19a3880ca3d2d1d69
 F ext/rbu/sqlite3rbu.c 4a3376c0fb9a844a799ac529fb81260523f6b13c9f629bc270c632dbae5fc1f8
 F ext/rbu/sqlite3rbu.h 9d923eb135c5d04aa6afd7c39ca47b0d1d0707c100e02f19fdde6a494e414304
 F ext/rbu/test_rbu.c ee6ede75147bc081fe9bc3931e6b206277418d14d3fbceea6fdc6216d9b47055
-F ext/recover/dbdata.c 0a943861ec096de375097e0aaff07b480a002eab9b01fecd3f9e828faf4ef624
+F ext/recover/dbdata.c a22ecd689f00ff2ad33b5633c4ef84c8f088c65faeac18d4eb73c128395c7aec
 F ext/recover/recover1.test e16d78e94183562abff569967b18b7c77451d7044365516cd0fe14713a284851
 F ext/recover/recover_common.tcl a61306c1eb45c0c3fc45652c35b2d4ec19729e340bdf65a272ce4c229cefd85a
 F ext/recover/recoverbuild.test c74170e0f7b02456af41838afeb5353fdb985a48cc2331d661bbabbca7c6b8e3
@@ -2191,8 +2191,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 aab59f9f7c1c4cfac4d29d7c7a381583295312baf3b9a75e30a617b1541e12e1
-R 818d4377176309545f29a9d7bd0669c5
+P 54a49f1847f95c377f0f611eb10f635b879bba8c2eb25e65e2f66a56f4f9a505
+R 03f38bbe86d08cc2accd8330faccbd25
 U dan
-Z 22a050d68d008d1c3bd9c69172084f42
+Z 9c29ad8747a8fddc9cb270f4ac86c97e
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 4f0d499f6ca0f85aa246f4d2af2e7ec9a47bf03f..b6db5e040b05786da4bd4078f3cf825f6f17bfb0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-54a49f1847f95c377f0f611eb10f635b879bba8c2eb25e65e2f66a56f4f9a505
\ No newline at end of file
+3210e1ca4d0efedf9710c97abd050ba10d3af98cb1f029c26daa84daf42fbc7e
\ No newline at end of file