From: drh <drh@noemail.net>
Date: Tue, 11 Oct 2011 18:18:54 +0000 (+0000)
Subject: Change the behavior of the readonly_shm=1 query parameter so that it never
X-Git-Tag: version-3.7.9~51
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3ec4a0c1a5bd314d2bb97f741e9ff49a1811ea5f;p=thirdparty%2Fsqlite.git

Change the behavior of the readonly_shm=1 query parameter so that it never
attempts to open the -shm file read/write.

FossilOrigin-Name: f1364004836078378e4005ab3eb9c0a04e3d4ce7
---

diff --git a/manifest b/manifest
index f38e0e3be4..152af8299b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sall\sprecision\sand\swidth\slimits\sfrom\sformatting\sfields\sin\sthe\nsqlite3_mprintf()\sfamily\sof\sfunctions.\sMalloc\sfor\sspace\sas\snecessary.\nThe\sprevents\sa\sstack\soverflow\son\svery\slarge\snumbers\susing\s%f.
-D 2011-10-11T17:54:54.587
+C Change\sthe\sbehavior\sof\sthe\sreadonly_shm=1\squery\sparameter\sso\sthat\sit\snever\nattempts\sto\sopen\sthe\s-shm\sfile\sread/write.
+D 2011-10-11T18:18:54.704
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in a162fe39e249b8ed4a65ee947c30152786cfe897
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -165,7 +165,7 @@ F src/os.c 3b3f69c34be7f998f5ea6bd46a2fe8a2b7fa8f70
 F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
-F src/os_unix.c 9da63854b702e0855ce13711a80d8bdcc5b69549
+F src/os_unix.c b14e8b40e28d983a908249442e1e0273a1ecb64e
 F src/os_win.c fbe47c7fdc9a846a772bbf98719c328becad5f8a
 F src/pager.c 8a6ac3e0d9694412076e2273e3c81e9c4e08758f
 F src/pager.h dbcaa791e8b6c3a6b77c168c5c27deec289fb176
@@ -905,7 +905,7 @@ F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 F test/walmode.test 4022fe03ae6e830583672caa101f046438a0473c
 F test/walnoshm.test 84ca10c544632a756467336b7c3b864d493ee496
 F test/walpersist.test fd40d33765b2693f721c90c66d97f99757559006
-F test/walro.test 412d0809300b94ba142440e94d6a30eabf2220b7
+F test/walro.test e6bb27762c9f22601cbb8bff6e0acfd124e74b63
 F test/walshared.test 6dda2293880c300baf5d791c307f653094585761
 F test/walslow.test e7be6d9888f83aa5d3d3c7c08aa9b5c28b93609a
 F test/walthread.test a2ed5270eb695284d4ad27d252517bdc3317ee2a
@@ -966,7 +966,7 @@ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
 F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 9325c1a8c413dfbf0381190d8347f0a446ae5f5b
-R e5d1b1fb843cbf71cdab9d042be23020
+P 1f843fb383583ee7ef51c13b8a820744e450101a
+R 87c5e36e725d4b46722e677165962480
 U drh
-Z 4feb18f759ff84be86477c96fb244530
+Z 87c8aa4ca9cebc791402bbaa3b6f9b8a
diff --git a/manifest.uuid b/manifest.uuid
index 4c5accd9f0..c27b8b842a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1f843fb383583ee7ef51c13b8a820744e450101a
\ No newline at end of file
+f1364004836078378e4005ab3eb9c0a04e3d4ce7
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index a23a76234b..6e87a4bfdf 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -3854,16 +3854,15 @@ static int unixOpenSharedMemory(unixFile *pDbFd){
     }
 
     if( pInode->bProcessLock==0 ){
-      pShmNode->h = robust_open(zShmFilename, O_RDWR|O_CREAT,
-                               (sStat.st_mode & 0777));
+      const char *zRO;
+      int openFlags = O_RDWR | O_CREAT;
+      zRO = sqlite3_uri_parameter(pDbFd->zPath, "readonly_shm");
+      if( zRO && sqlite3GetBoolean(zRO) ){
+        openFlags = O_RDONLY;
+        pShmNode->isReadonly = 1;
+      }
+      pShmNode->h = robust_open(zShmFilename, openFlags, (sStat.st_mode&0777));
       if( pShmNode->h<0 ){
-        const char *zRO;
-        zRO = sqlite3_uri_parameter(pDbFd->zPath, "readonly_shm");
-        if( zRO && sqlite3GetBoolean(zRO) ){
-          pShmNode->h = robust_open(zShmFilename, O_RDONLY,
-                                    (sStat.st_mode & 0777));
-          pShmNode->isReadonly = 1;
-        }
         if( pShmNode->h<0 ){
           rc = unixLogError(SQLITE_CANTOPEN_BKPT, "open", zShmFilename);
           goto shm_open_err;
diff --git a/test/walro.test b/test/walro.test
index a8c489a792..3ae7d53cd9 100644
--- a/test/walro.test
+++ b/test/walro.test
@@ -143,7 +143,7 @@ do_multiclient_test tn {
   } {1 {unable to open database file}}
 
   # Also test that if the -shm file can be opened for read/write access,
-  # it is, even if readonly_shm=1 is present in the URI.
+  # it is not if readonly_shm=1 is present in the URI.
   do_test 1.3.2.1 {
     code1 { db close }
     code2 { db2 close }
@@ -151,8 +151,8 @@ do_multiclient_test tn {
   } {0}
   do_test 1.3.2.2 {
     code1 { sqlite3 db file:test.db?readonly_shm=1 }
-    sql1 { SELECT * FROM t1 }
-  } {a b c d e f g h i j k l}
+    csql1 { SELECT * FROM sqlite_master }
+  } {1 {unable to open database file}}
   do_test 1.3.2.3 {
     code1 { db close }
     close [open test.db-shm w]