From: drh <>
Date: Thu, 27 Mar 2025 10:59:18 +0000 (+0000)
Subject: Fix an off-by-one bug in the ".dbtotxt" command from the shell that results
X-Git-Tag: major-release~151
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7b3477c7764cb48cfc676454f9a35c377cb7c79f;p=thirdparty%2Fsqlite.git

Fix an off-by-one bug in the ".dbtotxt" command from the shell that results
in incorrect output.

FossilOrigin-Name: 2345094e879c5538bfea005785ce0848e6d565a49bcb48b323c258d00ccbe9b8
---

diff --git a/manifest b/manifest
index aa15323e07..410f3e5513 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Reduce\sthe\sdelay\scaused\sby\santi-virus\sretries\sin\sWindows\swhen\sattempting\sto\nopen\sa\sdatabase\sfile\swith\sinsufficient\spermission.
-D 2025-03-26T22:23:22.787
+C Fix\san\soff-by-one\sbug\sin\sthe\s".dbtotxt"\scommand\sfrom\sthe\sshell\sthat\sresults\nin\sincorrect\soutput.
+D 2025-03-27T10:59:18.433
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -785,7 +785,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 20e1fbe8f840ffc0cd835e33f68a802a22e34faa918d7a269f3de242fda02f99
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c bfe14cdfceba54744b1c6c29099313f5173a0793dfaff0cd484774e9d05dbeab
-F src/shell.c.in 9d1b46e09c1b933b0c7afaf4ae27030dc356ee19ae4f95ce8bf3647035b9635b
+F src/shell.c.in 5acad3e594edad8de9f3e7f9a5ee8acfe934497ed642d29dc8fdd6665e25fdbf
 F src/sqlite.h.in fd70afd92948cf7cc93f687ac960bad1b0b6fbc436752419eff2fd65a1809380
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
@@ -2215,9 +2215,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 1f98fc07fdf06d699ffbf1521b0b5e937a582017e4325bd994b488e06becbecc ccdd67ad9a508530ccfcec582410768c24bca4eb8b05939577fb99a50dd44b15
-R 6c2ac8039a69021b5d572668708823ae
-T +closed ccdd67ad9a508530ccfcec582410768c24bca4eb8b05939577fb99a50dd44b15
+P d25c8a6222d4e3f20c137b1490572ad491d9c404ff12947d5867c3e00fcb615c
+R 7f1dc2197ed34b61300fd57f99c67793
 U drh
-Z 0d5fc73351502e2a61a26190ba1c4a5b
+Z 6f6d82890663e463e31bf8fc619d730c
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 35e8e088e6..a4c3c5b00b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d25c8a6222d4e3f20c137b1490572ad491d9c404ff12947d5867c3e00fcb615c
+2345094e879c5538bfea005785ce0848e6d565a49bcb48b323c258d00ccbe9b8
diff --git a/src/shell.c.in b/src/shell.c.in
index 8272956ebd..4efcfee953 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -6855,7 +6855,7 @@ static int shell_dbtotxt_command(ShellState *p, int nArg, char **azArg){
       for(j=0; j<16 && aLine[j]==0; j++){}
       if( j==16 ) continue;
       if( !seenPageLabel ){
-        sqlite3_fprintf(p->out, "| page %lld offset %lld\n", pgno, pgno*pgSz);
+        sqlite3_fprintf(p->out, "| page %lld offset %lld\n",pgno,(pgno-1)*pgSz);
         seenPageLabel = 1;
       }
       sqlite3_fprintf(p->out, "|  %5d:", i);