Fix errors in comments on this branch. Also prefer SQLITE_NOMEM_BKPT to SQLITE_NOMEM.

FossilOrigin-Name: ac17669e840dbac5c7c75e9b6014cca2d289aba8de36f9d1d0d61186e8cc6207

diff --git a/manifest b/manifest
index 7cbd0286fbc2e5b59cd388c5f23e6065536d75d4..c4837ad0b5d70333888c3ec84f21cf2cb326d322 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\smemory\sleak\sthat\scould\sfollow\san\sOOM\serror\sin\sthe\snew\scode\son\sthis\sbranch.
-D 2026-06-12T17:16:12.267
+C Fix\serrors\sin\scomments\son\sthis\sbranch.\sAlso\sprefer\sSQLITE_NOMEM_BKPT\sto\sSQLITE_NOMEM.
+D 2026-06-12T17:32:44.076
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -726,7 +726,7 @@ F src/os_setup.h 8efc64eda6a6c2f221387eefc2e7e45fd5a3d5c8337a7a83519ba4fbd2957ae
 F src/os_unix.c 83759942d1ea8d59daed50901c123016f845fada74caf3496b8a2537c9a08838
 F src/os_win.c 8df4b34ec6a08616a7ac33164999524ef773fa359d39ae9ae0e7e1ae4f167440
 F src/os_win.h c06ccc3a090cf54202ea58981c298817f3309d4c9e4d52ad0a02927346493721
-F src/pager.c b7635f6058437891b0c580955686dfe8c3e212c49f0a68fc9230a2ee1ecb444b
+F src/pager.c f88073a00933c885b167b6d25afc4d1b83c1706943572f5653fb64a7f5bde105
 F src/pager.h 6137149346e6c8a3ddc1eeb40aee46381e9bc8b0fcc6dda8a1efde993c2275b8
 F src/parse.y d5a3c5b0277a441c38b35071c05e2b61ff5fc918a63309c809f4b6706179c320
 F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484
@@ -2209,8 +2209,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P 37aa82a50a0a1c5edb4c4f2de1cb00fa009ebbfeb420df3de72231c5d883518a
-R 772da6d981cb3b84c26401db02a8f3e5
+P d4774a898730d9ef7564bba0a8531748e31e6517ab29564c2f5a0196c1584451
+R 0e3a40c6a676437d4bacd3a78c13aea8
 U dan
-Z 42d4e0e9d2c0d710032a00cb77f8e03f
+Z 89b45f7095636c43a86f36eb5ddc7660
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 8bd35fe9c42ef00cf72466cca183ad585b957d56..1086a8ad7c56132a91248954ecf61ec92bc28588 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d4774a898730d9ef7564bba0a8531748e31e6517ab29564c2f5a0196c1584451
+ac17669e840dbac5c7c75e9b6014cca2d289aba8de36f9d1d0d61186e8cc6207

diff --git a/src/pager.c b/src/pager.c
index 1f8cd855067aae10c9d040d3bf2bca0aa2e86649..67b5b3673ed9622d4e8b24ea7d74e4df7248ad82 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -1290,7 +1290,7 @@ static void freeSuperJournal(char *zSuper){
 ** Refer to comments above writeSuperJournal() for the format used to store 
 ** a super-journal file name at the end of a journal file.
 **
-** Parmeter nSuper is passed the maximum allowable size of the super journal
+** Parameter nSuper is passed the maximum allowable size of the super journal
 ** name in bytes. If the super-journal name in the journal is longer than
 ** nSuper bytes (including a nul-terminator), then this is handled as if no
 ** super-journal name were present in the journal.
@@ -1324,7 +1324,7 @@ static int readSuperJournal(sqlite3_file *pJrnl, u64 nSuper, char **pzSuper){
 
   zOut = (char*)sqlite3MallocZero(4 + len + 2);
   if( !zOut ){
-    rc = SQLITE_NOMEM;
+    rc = SQLITE_NOMEM_BKPT;
   }else{
     zOut = &zOut[4];
     if( SQLITE_OK==(rc = sqlite3OsRead(pJrnl, zOut, len, szJ-16-len)) ){
@@ -2835,13 +2835,7 @@ static int pager_playback(Pager *pPager, int isHot){
   ** If a super-journal file name is specified, but the file is not
   ** present on disk, then the journal is not hot and does not need to be
   ** played back.
-  **
-  ** TODO: Technically the following is an error because it assumes that
-  ** buffer Pager.pTmpSpace is (mxPathname+1) bytes or larger. i.e. that
-  ** ((pPager->pageSize+8) >= pPager->pVfs->mxPathname+1). Using os_unix.c,
-  ** mxPathname is 512, which is the same as the minimum allowable value
-  ** for pageSize, and so this assumption holds. But it might not for some
-  ** custom VFS.  */
+  */
   rc = readSuperJournal(pPager->jfd, 1+(i64)pPager->pVfs->mxPathname, &zSuper);
   if( rc==SQLITE_OK && zSuper ){
     rc = sqlite3OsAccess(pVfs, zSuper, SQLITE_ACCESS_EXISTS, &res);