Stricter assert() statements on unixShmSystemLock().

FossilOrigin-Name: ed01ed337c04cce4cdbb6e80628b6f716d537e072b80067bd2bd6c5d18a1454f

diff --git a/manifest b/manifest
index f5119a055c53a0a7295b2281ff59179ee70cad7c..099d1de88593020986e666d483364c739d691463 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\sit\sparticularly\sclear\sin\sthe\swasm\sbuild\soutput\sthat\sunsupported\sbuilds\sare\sexactly\sthat.\sCosmetic\stweak\sonly,\sno\sfunctional\schanges.
-D 2025-10-24T20:29:12.612
+C Stricter\sassert()\sstatements\son\sunixShmSystemLock().
+D 2025-10-25T11:37:54.456
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -720,7 +720,7 @@ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06
 F src/os_kv.c fb7ba8d6204197357f1eb7e1c7450d09c10043bf7e99aba602f4aa46b8fb11a3
 F src/os_setup.h 8efc64eda6a6c2f221387eefc2e7e45fd5a3d5c8337a7a83519ba4fbd2957ae2
-F src/os_unix.c b3da55bc4bb214b2bfb1e430b10e9d3ebcf6b11741921ab044c9b9539c8fcc4f
+F src/os_unix.c d822c2749943eb935cd0edfe3430080a9a2c569510eee4d8c81aed08ce03e5fd
 F src/os_win.c f81a7cffdfe8c593a840895b3f64290714f0186b06302d2c397012252d830374
 F src/os_win.h 4c247cdb6d407c75186c94a1e84d5a22cbae4adcec93fcae8d2bc1f956fd1f19
 F src/pager.c 113f9149092ccff6cf90e97c2611200e5a237f13d26c394bc9fd933377852764
@@ -2171,8 +2171,8 @@ F tool/version-info.c 33d0390ef484b3b1cb685d59362be891ea162123cea181cb8e6d2cf6dd
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 62917cd4297e734477d3201481548ddb7f79ec977b9da7d9313bc7f1c0091187
-R b1d8317162671ed99b7d1d2f19b6b6e0
-U stephan
-Z d8ff76dad5b17b41321b9c76fd1e674b
+P 86f53a2eb37d8ec98bc9d4c6b00253cc00d798e79c7d409e65d608354a556e19
+R dcf753e10a96715b1840de9a0d3fab75
+U drh
+Z 78fddbc0c09532d4fb60b8889bacc776
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 3f58b77c67c9404a3fd0641d295e4bdc91529116..62cb49d79a136164b730fc4a8afac008cb5fe335 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-86f53a2eb37d8ec98bc9d4c6b00253cc00d798e79c7d409e65d608354a556e19
+ed01ed337c04cce4cdbb6e80628b6f716d537e072b80067bd2bd6c5d18a1454f

diff --git a/src/os_unix.c b/src/os_unix.c
index b9e10b2c81cd9f4ae12f26b35ef921b3e680be97..47193625523c0a3f7dc0fed7e3629ed73f89e5a4 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -4488,7 +4488,8 @@ static int unixShmSystemLock(
 
   /* Locks are within range */
   assert( n>=1 && n<=SQLITE_SHM_NLOCK );
-  assert( ofst>=UNIX_SHM_BASE && ofst<=(UNIX_SHM_DMS+SQLITE_SHM_NLOCK) );
+  assert( ofst>=UNIX_SHM_BASE && ofst<=UNIX_SHM_DMS );
+  assert( ofst+n-1<=UNIX_SHM_DMS );
 
   if( pShmNode->hShm>=0 ){
     int res;