From: dan <dan@noemail.net>
Date: Thu, 21 Mar 2013 20:00:07 +0000 (+0000)
Subject: Avoid calling xRead() on a part of the database file that is memory mapped.
X-Git-Tag: version-3.7.17~114^2~62
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c49427fc25a0fc1738a4f7062abfea45642fbfc;p=thirdparty%2Fsqlite.git

Avoid calling xRead() on a part of the database file that is memory mapped.

FossilOrigin-Name: c8eac290a7240d69494bd0dad5ed1fdc2505f703
---

diff --git a/manifest b/manifest
index 8819c52a55..b91c073e14 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swhen\sopening\sa\swrite-transaction\swhile\sthere\sexist\sread-only\sb-tree\scursors\sin\smmap\smode.
-D 2013-03-21T15:57:32.562
+C Avoid\scalling\sxRead()\son\sa\spart\sof\sthe\sdatabase\sfile\sthat\sis\smemory\smapped.
+D 2013-03-21T20:00:07.703
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 9a804abbd3cae82d196e4d33aba13239e32522a5
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -162,7 +162,7 @@ F src/os.h 8d92f87f5fe14b060a853ca704b8ef6d3daee79b
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_unix.c be66c31337361a72227638d6f41c7f2031739642
 F src/os_win.c f7da4dc0a2545c0a430080380809946ae4d676d6
-F src/pager.c d59af9a70aa2d7222b127351fa3cbe70660e4150
+F src/pager.c 5ee2ec6a10aa3d85548e6f0337260f0b2a670899
 F src/pager.h 241d72dc0905df042da165f086d03505cb0bb50c
 F src/parse.y 5d5e12772845805fdfeb889163516b84fbb9ae95
 F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
@@ -1039,7 +1039,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 5ed8ad780c991d2ca44003ee84350fb5e95ad58e
-R fc9bd174ea58046e3b5bc29693aabeb6
+P 32e0bbb73609ac3ad096a60f1de3095bc79fb0cc
+R 78d8196d81dc00ab1ac5a50caf4d157f
 U dan
-Z 811da101d49a049638aae5d61fad1590
+Z e76f59323062e94934c6de1e92e548e8
diff --git a/manifest.uuid b/manifest.uuid
index 95a0f78145..0a2c6d8ff4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-32e0bbb73609ac3ad096a60f1de3095bc79fb0cc
\ No newline at end of file
+c8eac290a7240d69494bd0dad5ed1fdc2505f703
\ No newline at end of file
diff --git a/src/pager.c b/src/pager.c
index 2848f9ad05..913ae74c46 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -5130,9 +5130,13 @@ int sqlite3PagerSharedLock(Pager *pPager){
       rc = pagerPagecount(pPager, &nPage);
       if( rc ) goto failed;
 
-      if( nPage>0 ){
+      if( nPage>0 || pPager->pMap ){
         IOTRACE(("CKVERS %p %d\n", pPager, sizeof(dbFileVers)));
-        rc = sqlite3OsRead(pPager->fd, &dbFileVers, sizeof(dbFileVers), 24);
+        if( pPager->pMap ){
+          memcpy(&dbFileVers, &((u8 *)(pPager->pMap))[24], sizeof(dbFileVers));
+        }else{
+          rc = sqlite3OsRead(pPager->fd, &dbFileVers, sizeof(dbFileVers), 24);
+        }
         if( rc!=SQLITE_OK ){
           goto failed;
         }