Add an assert() in the Win32 VFS.

FossilOrigin-Name: 22e58330461736ca22d6f4d7eab897a3597de2e7434a6f4a474f0f0d7f964281

diff --git a/manifest b/manifest
index e214aee04cbedc2bc543f3bd159d6a2132c90b55..68233db6691bb101a52e1cfe91dcbbb4c4b0b5ed 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\swalro2.test\sto\sbetter\sensure\sthat\sreadonly_shm\sclients\sare\snot\susing\ninvalid\s*-shm\sfiles.
-D 2017-11-09T20:34:35.406
+C Add\san\sassert()\sin\sthe\sWin32\sVFS.
+D 2017-11-09T20:37:37.876
 F Makefile.in 5bae3f2f3d42f2ad52b141562d74872c97ac0fca6c54953c91bb150a0e6427a8
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 3a5cb477ec3ce5274663b693164e349db63348667cd45bad78cc13d580b691e2
@@ -448,7 +448,7 @@ F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 F src/os_unix.c e87cef0bb894b94d96ee3af210be669549d111c580817d14818101b992640767
-F src/os_win.c cf4099958dcc72a9e36ce161638aa369811012fa1e2592415fdc1fdafdf26c8c
+F src/os_win.c 64bc61821f75b37ca213da93aef84557c8730be6e0ca93943223b5e57fe6e5a3
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c 07cf850241667874fcce9d7d924c814305e499b26c804322e2261247b5921903
 F src/pager.h 581698f2177e8bd4008fe4760898ce20b6133d1df22139b9101b5155f900df7a
@@ -1669,7 +1669,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 abef05353554e72f4d08aff562b87ff8530e8537a79e58d831205ea8c46eed07
-R 43c8def15803418ff2b6211daf889aff
-U dan
-Z b374f730e5d2822de9c4c678f7c53c0c
+P ff630b66714b20c09888ead0a45f344d63e0d9a5208867d6266e74f79187076c
+R 9f94324b020c3efbc23aa89a0c6b1ac2
+U mistachkin
+Z b9496fb62e9a99521b89e7f9003a99d8

diff --git a/manifest.uuid b/manifest.uuid
index d156b1b802de4e78f2187ab7018ce7c46b597415..da346528d8d7cd9561a035db30ad00d3d92863b4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ff630b66714b20c09888ead0a45f344d63e0d9a5208867d6266e74f79187076c
\ No newline at end of file
+22e58330461736ca22d6f4d7eab897a3597de2e7434a6f4a474f0f0d7f964281
\ No newline at end of file

diff --git a/src/os_win.c b/src/os_win.c
index 05ae7e67db886336330a5a75d6ae0baa021e98b9..aff48e25e942f4d6f0ee2766063436369c1be762 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -3885,6 +3885,7 @@ static int winGetShmDmsLockType(
       if( winIsLockConflict(lastErrno) ){
         if( pLockType ) *pLockType = WINSHM_WRLCK;
       }else if( winIsLockMissing(lastErrno) ){
+        assert( bReadOnly );
         if( pLockType ) *pLockType = WINSHM_UNLCK;
       }else{
         return SQLITE_IOERR_READ;