From: drh <drh@noemail.net>
Date: Thu, 21 May 2020 20:38:39 +0000 (+0000)
Subject: Change a NEVER macro into a NO_TEST comment, as the conditional is reachable,
X-Git-Tag: version-3.32.0~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f25f8d58349db52398168579a1d696fa4937dc1f;p=thirdparty%2Fsqlite.git

Change a NEVER macro into a NO_TEST comment, as the conditional is reachable,
but only when compiling for Windows 32-bit.

FossilOrigin-Name: ce36b6d1331edba5a921fef32553e2470a79bdb1f62d2cfd81190691c83d5b06
---

diff --git a/manifest b/manifest
index ca56096d0d..cb328cbc7e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\sanother\spotential\sOOB\sread\sin\ssqlite3expert.c.
-D 2020-05-21T19:13:46.854
+C Change\sa\sNEVER\smacro\sinto\sa\sNO_TEST\scomment,\sas\sthe\sconditional\sis\sreachable,\nbut\sonly\swhen\scompiling\sfor\sWindows\s32-bit.
+D 2020-05-21T20:38:39.168
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -504,7 +504,7 @@ F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
 F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
 F src/mem3.c 8768ac94694f31ffaf8b4d0ea5dc08af7010a35a
 F src/mem5.c 9bf955937b07f8c32541c8a9991f33ce3173d944
-F src/memdb.c 1d05bcc3fb6bde5c4aab7a56279d232f204625d74e627121e0562f355f5c843e
+F src/memdb.c 252137ca122acb8f54a99b48cf9f96a31d5130f19d174381a53294446d8b64a3
 F src/memjournal.c 7561c01c90958f3ba9bc6cb2d857123d932bdfa5539ea34427a0957b2e35154d
 F src/msvc.h 3a15918220367a8876be3fa4f2abe423a861491e84b864fb2b7426bf022a28f8
 F src/mutex.c 5e3409715552348732e97b9194abe92fdfcd934cfb681df4ba0ab87ac6c18d25
@@ -1866,7 +1866,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 4218c7b71fb6b227dbe4b852718584c150164af2d84e067cb810aa602554a609
-R a34ce7e81c0a64aa29d603331470468c
-U dan
-Z d5344c700a7ec03fab9c05b6e6d6dc98
+P 0ccea80092f16e7f17f4c4de4f8be3fdef217199fcc08ace37e179c1b22c1294
+R b5a877f3e2a7ab538bc565ffd2aae787
+U drh
+Z 2acfb479c943aedec5bae0c532948916
diff --git a/manifest.uuid b/manifest.uuid
index ca563882f2..ffe54a24bf 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0ccea80092f16e7f17f4c4de4f8be3fdef217199fcc08ace37e179c1b22c1294
\ No newline at end of file
+ce36b6d1331edba5a921fef32553e2470a79bdb1f62d2cfd81190691c83d5b06
\ No newline at end of file
diff --git a/src/memdb.c b/src/memdb.c
index aabac5226f..10da6d8018 100644
--- a/src/memdb.c
+++ b/src/memdb.c
@@ -613,10 +613,11 @@ int sqlite3MemdbInit(void){
   sqlite3_vfs *pLower = sqlite3_vfs_find(0);
   int sz = pLower->szOsFile;
   memdb_vfs.pAppData = pLower;
-  /* In all known configurations of SQLite, the size of a default
-  ** sqlite3_file is greater than the size of a memdb sqlite3_file.
-  ** Should that ever change, remove the following NEVER() */
-  if( NEVER(sz<sizeof(MemFile)) ) sz = sizeof(MemFile);
+  /* The following conditional can only be true when compiled for
+  ** Windows x86 and SQLITE_MAX_MMAP_SIZE=0.  We always leave
+  ** it in, to be safe, but it is marked as NO_TEST since there
+  ** is no way to reach it under most builds. */
+  if( sz<sizeof(MemFile) ) sz = sizeof(MemFile); /*NO_TEST*/
   memdb_vfs.szOsFile = sz;
   return sqlite3_vfs_register(&memdb_vfs, 0);
 }