Handle very large URI pathnames for in-memory shared-cache databases.

FossilOrigin-Name: 586a94e85bc13700a2093734711c1367fa814b8c

diff --git a/manifest b/manifest
index f76a238037146c8e3b56632a07db60eb5aa7f8c6..a38babcf26b8700b06108cd80a711fdc48758413 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings\sin\slemon.c
-D 2015-03-31T15:15:48.726
+C Handle\svery\slarge\sURI\spathnames\sfor\sin-memory\sshared-cache\sdatabases.
+D 2015-03-31T16:33:08.816
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -173,7 +173,7 @@ F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
 F src/backup.c ff743689c4d6c5cb55ad42ed9d174b2b3e71f1e3
 F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
 F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
-F src/btree.c e565971caa0265d3cabc8b15d7017899a7814051
+F src/btree.c 525f19f01d5976dbc12e83e7339e41488de79183
 F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
 F src/btreeInt.h 2bfefc01875d8da066504c233ec259fcb3b2ef72
 F src/build.c 0419bba592c22f6d00e6d57a2ca7136720d02c1a
@@ -340,7 +340,7 @@ F test/async3.test d73a062002376d7edc1fe3edff493edbec1fc2f7
 F test/async4.test 1787e3952128aa10238bf39945126de7ca23685a
 F test/async5.test 383ab533fdb9f7ad228cc99ee66e1acb34cc0dc0
 F test/atof1.test 08a61df9365c341f334a65f4348897312d8f3db7
-F test/attach.test 0d112b7713611fdf0340260192749737135fda5f
+F test/attach.test 437107943f14d131cf5efc2ae5305a94d7cb1d58
 F test/attach2.test 0ec5defa340363de6cd50fd595046465e9aaba2d
 F test/attach3.test 359eb65d00102cdfcef6fa4e81dc1648f8f80b27
 F test/attach4.test 53bf502f17647c6d6c5add46dda6bac8b6f4665c
@@ -1248,7 +1248,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 0c0ecfd68573957553b966229a67bfcd10ce4b99
-R f295c13e7a998be1a5a78140716d3389
+P bbe7dcda689a25860f2104804f00ba0a720c1372
+R 6f0e4814d1e4f882b35ba2b9dccc56cc
 U drh
-Z 1c953be9eacdcbbbb1c665e7b3932b7e
+Z d85481fb8858c2d74f205f2246e5afa6

diff --git a/manifest.uuid b/manifest.uuid
index 544169567d403496ffcca192a0a1c28e656c39b3..7c14a1b036ff6ffb11528be7d1ac5f9563ccd322 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bbe7dcda689a25860f2104804f00ba0a720c1372
\ No newline at end of file
+586a94e85bc13700a2093734711c1367fa814b8c
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index a4eae640259916c9939e3c2894dc5a6d3f77a549..b497cd7468cb310d937bcab1a8c7c67a47a3f76a 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -1959,16 +1959,18 @@ int sqlite3BtreeOpen(
   */
   if( isTempDb==0 && (isMemdb==0 || (vfsFlags&SQLITE_OPEN_URI)!=0) ){
     if( vfsFlags & SQLITE_OPEN_SHAREDCACHE ){
+      int nFilename = sqlite3Strlen30(zFilename)+1;
       int nFullPathname = pVfs->mxPathname+1;
-      char *zFullPathname = sqlite3Malloc(nFullPathname);
+      char *zFullPathname = sqlite3Malloc(MAX(nFullPathname,nFilename));
       MUTEX_LOGIC( sqlite3_mutex *mutexShared; )
+
       p->sharable = 1;
       if( !zFullPathname ){
         sqlite3_free(p);
         return SQLITE_NOMEM;
       }
       if( isMemdb ){
-        memcpy(zFullPathname, zFilename, sqlite3Strlen30(zFilename)+1);
+        memcpy(zFullPathname, zFilename, nFilename);
       }else{
         rc = sqlite3OsFullPathname(pVfs, zFilename,
                                    nFullPathname, zFullPathname);

diff --git a/test/attach.test b/test/attach.test
index be5f9881c31833e2da37256dfb19f2c66f3c8c9f..31c24e61d9fa3108f14c6fbe4cb1c848eb71a124 100644 (file)
--- a/test/attach.test
+++ b/test/attach.test
@@ -859,4 +859,16 @@ do_test attach-10.2 {
   }] 9 end
 } {4 noname {} 5 inmem {}}
 
+# Attach with a very long URI filename.
+#
+db close
+sqlite3 db test.db -uri 1
+do_execsql_test attach-11.1 {
+  ATTACH printf('file:%09000x/x.db?mode=memory&cache=shared',1) AS aux1;
+  CREATE TABLE aux1.t1(x,y);
+  INSERT INTO aux1.t1(x,y) VALUES(1,2),(3,4);
+  SELECT * FROM aux1.t1;
+} {1 2 3 4}
+
+
 finish_test