From: mistachkin <mistachkin@noemail.net>
Date: Wed, 18 Jan 2017 19:06:41 +0000 (+0000)
Subject: Minimize the requested permissions when opening the volume on Windows 7 and Vista.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=235e27c0e3c13e4c48046481485b9fce65e4fd0a;p=thirdparty%2Fsqlite.git

Minimize the requested permissions when opening the volume on Windows 7 and Vista.

FossilOrigin-Name: 8d429a59cdad1693827b41369d642f9486c01155
---

diff --git a/manifest b/manifest
index d4fa016207..d124678cfa 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sruntime\sversion\schecking\sfor\swinSectorSize.
-D 2017-01-18T01:11:03.600
+C Minimize\sthe\srequested\spermissions\swhen\sopening\sthe\svolume\son\sWindows\s7\sand\sVista.
+D 2017-01-18T19:06:41.323
 F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -374,7 +374,7 @@ F src/os.h 8e976e59eb4ca1c0fca6d35ee803e38951cb0343
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 F src/os_unix.c 30e2c43e4955db990e5b5a81e901f8aa74cc8820
-F src/os_win.c 05f014e95e7ad2507374a9f80b832d56de445a95
+F src/os_win.c 2f6dd3eed5566b13e75569c18984fffb5a546241
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c 9dc72d23eebbdf992bd69f2ab954d0d3a27c7340
 F src/pager.h d1e944291030351f362a0a7da9b5c3e34e603e39
@@ -1545,7 +1545,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 de699ead5a8c5bcf074ef220365fe4a1e5310de4
-R 7e336eddf8e4bd1f4a260e074d2c5159
+P cb9d1ab33d4109e0712d1a9dd2e51861e168e418
+R 2203396c1fcf2bc7c6ca68db070932df
 U mistachkin
-Z 6482d34b0b03f42a5b1e7cdd22c135ce
+Z a4a51f21ac0fdade390d7b88237a4d72
diff --git a/manifest.uuid b/manifest.uuid
index 5976aa209e..348030c1d1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cb9d1ab33d4109e0712d1a9dd2e51861e168e418
\ No newline at end of file
+8d429a59cdad1693827b41369d642f9486c01155
\ No newline at end of file
diff --git a/src/os_win.c b/src/os_win.c
index e91ebfedb6..cf146be157 100644
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -3701,8 +3701,7 @@ static int winSectorSize(sqlite3_file *id){
       assert( (zDisk[4]>=L'A' && zDisk[4]<=L'Z')
            || (zDisk[4]>=L'a' && zDisk[4]<=L'z')
       );
-      hDisk = osCreateFileW(zDisk, STANDARD_RIGHTS_READ,
-                            FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
+      hDisk = osCreateFileW(zDisk, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
                             OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
       if( hDisk!=NULL ){
         STORAGE_PROPERTY_QUERY query;