From: drh <>
Date: Thu, 9 Nov 2023 18:41:42 +0000 (+0000)
Subject: Ensure 8-byte alignment of data structues in sqlite3_database_file_object().
X-Git-Tag: version-3.44.1~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3414ff463a70a51244b22e70d4e1f4bfb455914f;p=thirdparty%2Fsqlite.git

Ensure 8-byte alignment of data structues in sqlite3_database_file_object().

FossilOrigin-Name: 3cfcaafaff181c7945cc659ff6d58a0d2232d49830a259f0510d833a7a5a824b
---

diff --git a/manifest b/manifest
index c06d9be4c7..e94cc2a160 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Expose\sSQLITE_RESULT_SUBTYPE\sto\swasm.
-D 2023-11-09T17:55:27.850
+C Ensure\s8-byte\salignment\sof\sdata\sstructues\sin\ssqlite3_database_file_object().
+D 2023-11-09T18:41:42.956
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -708,7 +708,7 @@ F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d87210
 F src/os_unix.c cb116fde9e3ca3c1bbfdf89d6928f776a2a34da168e2667426523a4db353b271
 F src/os_win.c 4a50a154aeebc66a1f8fb79c1ff6dd5fe3d005556533361e0d460d41cb6a45a8
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
-F src/pager.c 699aab8dfc88056d796b03b40c0ab979040d58dfc3ae9db207f1be91e4880bbf
+F src/pager.c 987ab3a2cd9065d62e9955474470ff733445e2357432a67e3d0f5a8f9313e334
 F src/pager.h f4d33fec8052603758792045493423b8871a996da2d0973927b7d36cd6070473
 F src/parse.y 020d80386eb216ec9520549106353c517d2bbc89be28752ffdca649a9eaf56ec
 F src/pcache.c 040b165f30622a21b7a9a77c6f2e4877a32fb7f22d4c7f0d2a6fa6833a156a75
@@ -2139,9 +2139,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 65a9cfc466d3d904af50fa5eba46d29c5a24e7dde06e5c50c03b343723be7441
-Q +6d2fe9848beb35a8206e49c2ffae29a3eb2fe6411d77f366e962ced3f83e4749
-R d2d108f3fa692966fa4f54fcbe86dbaa
-U stephan
-Z 54fda1517b80027c86721dffa66b915d
+P fc03988650645f0b08f1a3fb85b9ff54a04e0d7d27ca9f063198e43260826278
+R db70cc6c06b6554ebaacd4173f4d53eb
+U drh
+Z bcbfd1831490121e166c6f3ac2022ca0
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 956de6ca0a..23039df174 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fc03988650645f0b08f1a3fb85b9ff54a04e0d7d27ca9f063198e43260826278
\ No newline at end of file
+3cfcaafaff181c7945cc659ff6d58a0d2232d49830a259f0510d833a7a5a824b
\ No newline at end of file
diff --git a/src/pager.c b/src/pager.c
index e547504243..4687ab0f19 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -5062,10 +5062,13 @@ act_like_temp_file:
 */
 sqlite3_file *sqlite3_database_file_object(const char *zName){
   Pager *pPager;
+  const char *p;
   while( zName[-1]!=0 || zName[-2]!=0 || zName[-3]!=0 || zName[-4]!=0 ){
     zName--;
   }
-  pPager = *(Pager**)(zName - 4 - sizeof(Pager*));
+  p = zName - 4 - sizeof(Pager*);
+  assert( EIGHT_BYTE_ALIGNMENT(p) );
+  pPager = *(Pager**)p;
   return pPager->fd;
 }