Fix parsing of %00 in uri handling code.

FossilOrigin-Name: 44f0874a95408c75a296964a04eef00341abb94a

diff --git a/manifest b/manifest
index 936a159dc6a7e86cc1b61de121231aca62fc804d..f10443fcfdecbab86c916bcbdceda9d1b9175666 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sstart\sof\sthe\s"uri-filenames"\sfeature.
-D 2011-04-22T19:37:32.658
+C Fix\sparsing\sof\s%00\sin\suri\shandling\scode.
+D 2011-04-23T10:12:30.605
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -143,7 +143,7 @@ F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
 F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
 F src/loadext.c 3ae0d52da013a6326310655be6473fd472347b85
-F src/main.c 88a93debb7448053dfa7182fa4ae723a80b0644d
+F src/main.c cc9f5592000ee42e38b7086a097b19dc63518085
 F src/malloc.c 74c740e8ba22b806cfb980c8c0ddea1cbd54a20e
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206
@@ -450,7 +450,7 @@ F test/fts3al.test 07d64326e79bbdbab20ee87fc3328fbf01641c9f
 F test/fts3am.test 218aa6ba0dfc50c7c16b2022aac5c6be593d08d8
 F test/fts3an.test a49ccadc07a2f7d646ec1b81bc09da2d85a85b18
 F test/fts3ao.test b83f99f70e9eec85f27d75801a974b3f820e01f9
-F test/fts3atoken.test bbb9e63a915f3df0e35d06e0add932b5bf2d54a9
+F test/fts3atoken.test 402ef2f7c2fb4b3d4fa0587df6441c1447e799b3
 F test/fts3aux1.test 719c35cbbcc04dde8e5a54a6f69851a0af9ed1f2
 F test/fts3b.test e93bbb653e52afde110ad53bbd793f14fe7a8984
 F test/fts3c.test fc723a9cf10b397fdfc2b32e73c53c8b1ec02958
@@ -596,7 +596,7 @@ F test/notnull.test cc7c78340328e6112a13c3e311a9ab3127114347
 F test/null.test a8b09b8ed87852742343b33441a9240022108993
 F test/openv2.test af02ed0a9cbc0d2a61b8f35171d4d117e588e4ec
 F test/oserror.test 498d8337e9d15543eb7b004fef8594bf204ff43c
-F test/pager1.test d8672fd0af5f4f9b99b06283d00f01547809bebe
+F test/pager1.test 2f2f93411c1c5afa44ebdaf19152e4bd4d9cb1b3
 F test/pager2.test 745b911dde3d1f24ae0870bd433dfa83d7c658c1
 F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
 F test/pagerfault.test 9de4d3e0c59970b4c6cb8dac511fa242f335d8a7
@@ -837,7 +837,7 @@ F test/unique.test 083c7fff74695bcc27a71d75699deba3595bc9c2
 F test/unixexcl.test 9d80a54d86d2261f660758928959368ffc36151e
 F test/unordered.test e81169ce2a8f31b2c6b66af691887e1376ab3ced
 F test/update.test 8bc86fd7ef1a00014f76dc6a6a7c974df4aef172
-F test/uri.test a9f84a838e73268c3fa9ed29b03512cb7baa7aca
+F test/uri.test b951a30a7cde3cdd978bdbfb2484c12a521f92d4
 F test/utf16align.test 54cd35a27c005a9b6e7815d887718780b6a462ae
 F test/vacuum.test 29b60e8cc9e573b39676df6c4a75fe9e02d04a09
 F test/vacuum2.test 91a84c9b08adfc4472097d2e8deb0150214e0e76
@@ -930,10 +930,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P d8b149f5e465f7794739ed0210e1e5c53110ee9a
-R f623a8b9a02395ad34296947bebabb85
-T *branch * uri
-T *sym-uri *
-T -sym-trunk *
+P b8a8132e7148a7c90ca1352f20ab71d97b0bc4b0
+R d5dabedbe6f28cafb26739963e69b2b4
 U dan
-Z 1128ec625dbb3b0786239aee8b2345ad
+Z 7110de44a23dae8e6e6e15b3bc372cbd

diff --git a/manifest.uuid b/manifest.uuid
index 66d198381bcf569d2f3cc3cc05fdd10948ef32e2..81fe45f9fbc31e2781ff6e1aaeab84f0bc26cdf9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b8a8132e7148a7c90ca1352f20ab71d97b0bc4b0
\ No newline at end of file
+44f0874a95408c75a296964a04eef00341abb94a
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index e2bcf009b804a10459b71532ccb94722b6f707a7..12830cdab703740f394a2404972af9675fd1155e 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1803,6 +1803,18 @@ int sqlite3ParseUri(
   char **pzFile,                  /* OUT: Filename component of URI */
   char **pzErrMsg                 /* OUT: Error message (if rc!=SQLITE_OK) */
 ){
+  struct UriOption {
+    const char *zOption;
+    int mask;
+  } aOpt [] = {
+    { "vfs", 0 },
+    { "readonly",     SQLITE_OPEN_READONLY },
+    { "readwrite",    SQLITE_OPEN_READWRITE },
+    { "create",       SQLITE_OPEN_CREATE },
+    { "sharedcache",  SQLITE_OPEN_SHAREDCACHE },
+    { "privatecache", SQLITE_OPEN_PRIVATECACHE }
+  };
+
   int flags = *pFlags;
   const char *zVfs = zDefaultVfs;
   char *zFile;
@@ -1813,7 +1825,7 @@ int sqlite3ParseUri(
   if( ((flags & SQLITE_OPEN_URI) || sqlite3GlobalConfig.bOpenUri) 
    && nUri>=5 && memcmp(zUri, "file:", 5)==0 
   ){
-    char *zOpt = 0;
+    char *zOpt;
     int eState;                   /* Parser state when parsing URI */
     int iIn;                      /* Input character index */
     int iOut = 0;                 /* Output character index */
@@ -1852,18 +1864,36 @@ int sqlite3ParseUri(
         codepoint += sqlite3HexToInt(zUri[iIn++]);
 
         assert( codepoint>=0 && codepoint<256 );
-        if( codepoint==0 ) continue;
+        if( codepoint==0 ){
+          /* This branch is taken when "%00" appears within the URI. In this
+          ** case we ignore all text in the remainder of the path, name or
+          ** value currently being parsed. So ignore the current character
+          ** and skip to the next "?", "=" or "&", as appropriate. */
+          while( zUri[iIn] && zUri[iIn]!='#' 
+              && (eState!=0 || zUri[iIn]!='?')
+              && (eState!=1 || (zUri[iIn]!='=' && zUri[iIn]!='&'))
+              && (eState!=2 || zUri[iIn]!='&')
+          ){
+            iIn++;
+          }
+          continue;
+        }
         c = codepoint;
-      }else if( (eState==0 && c=='?') || (eState==1 && c=='=') ){
-        if( eState==0 ){
-          zOpt = &zFile[iOut+1];
+      }else if( eState==1 && (c=='&' || c=='=') ){
+        if( zFile[iOut-1]==0 ){
+          /* An empty option name. Ignore this option altogether. */
+          while( zUri[iIn] && zUri[iIn]!='#' && zUri[iIn-1]!='&' ) iIn++;
+          continue;
+        }
+        if( c=='&' ){
+          zFile[iOut++] = '\0';
+        }else{
+          eState = 2;
         }
-        eState++;
         c = 0;
-      }else if( eState!=0 && c=='&' ){
-        if( eState==1 ) zFile[iOut++] = '\0';
-        eState = 1;
+      }else if( (eState==0 && c=='?') || (eState==2 && c=='&') ){
         c = 0;
+        eState = 1;
       }
       zFile[iOut++] = c;
     }
@@ -1875,43 +1905,30 @@ int sqlite3ParseUri(
     ** here. Options that are interpreted here include "vfs" and those that
     ** correspond to flags that may be passed to the sqlite3_open_v2()
     ** method.  */
-    if( zOpt ){
-      struct Option {
-        const char *zOption;
-        int mask;
-      } aOpt [] = {
-        { "vfs", 0 },
-        { "readonly",     SQLITE_OPEN_READONLY },
-        { "readwrite",    SQLITE_OPEN_READWRITE },
-        { "create",       SQLITE_OPEN_CREATE },
-        { "sharedcache",  SQLITE_OPEN_SHAREDCACHE },
-        { "privatecache", SQLITE_OPEN_PRIVATECACHE }
-      };
-
-      while( zOpt[0] ){
-        int nOpt = sqlite3Strlen30(zOpt);
-        char *zVal = &zOpt[nOpt+1];
-        int nVal = sqlite3Strlen30(zVal);
-        int i;
-
-        for(i=0; i<ArraySize(aOpt); i++){
-          const char *z = aOpt[i].zOption;
-          if( nOpt==sqlite3Strlen30(z) && 0==memcmp(zOpt, z, nOpt) ){
-            int mask = aOpt[i].mask;
-            if( mask==0 ){
-              zVfs = zVal;
+    zOpt = &zFile[sqlite3Strlen30(zFile)+1];
+    while( zOpt[0] ){
+      int nOpt = sqlite3Strlen30(zOpt);
+      char *zVal = &zOpt[nOpt+1];
+      int nVal = sqlite3Strlen30(zVal);
+      int i;
+
+      for(i=0; i<ArraySize(aOpt); i++){
+        const char *z = aOpt[i].zOption;
+        if( nOpt==sqlite3Strlen30(z) && 0==memcmp(zOpt, z, nOpt) ){
+          int mask = aOpt[i].mask;
+          if( mask==0 ){
+            zVfs = zVal;
+          }else{
+            if( zVal[0]=='\0' || sqlite3GetBoolean(zVal) ){
+              flags |= mask;
             }else{
-              if( zVal[0]=='\0' || sqlite3GetBoolean(zVal) ){
-                flags |= mask;
-              }else{
-                flags &= ~mask;
-              }
+              flags &= ~mask;
             }
           }
         }
-
-        zOpt = &zVal[nVal+1];
       }
+
+      zOpt = &zVal[nVal+1];
     }
 
   }else{
@@ -1924,8 +1941,8 @@ int sqlite3ParseUri(
 
   *ppVfs = sqlite3_vfs_find(zVfs);
   if( *ppVfs==0 ){
-    sqlite3_free(zFile);
     *pzErrMsg = sqlite3_mprintf("no such vfs: %s", zVfs);
+    sqlite3_free(zFile);
     return SQLITE_ERROR;
   }
   *pFlags = flags;

diff --git a/test/fts3atoken.test b/test/fts3atoken.test
index d4c4825004d100dcc6f9ca43e7ab9df07b5de8f9..554259d0a55f23f3013cb6833ec017a17e34f38d 100644 (file)
--- a/test/fts3atoken.test
+++ b/test/fts3atoken.test
@@ -167,15 +167,16 @@ ifcapable icu {
   do_icu_test fts3token-4.6 MiddleOfTheOcean  $input $output
   do_icu_test fts3token-4.7 th_TH  $input $output
   do_icu_test fts3token-4.8 en_US  $input $output
-}
 
-do_execsql_test 5.1 {
-  CREATE VIRTUAL TABLE x1 USING fts3(name,TOKENIZE icu en_US);
-  insert into x1 (name) values (NULL);
-  insert into x1 (name) values (NULL);
-  delete from x1;
+  do_execsql_test 5.1 {
+    CREATE VIRTUAL TABLE x1 USING fts3(name,TOKENIZE icu en_US);
+    insert into x1 (name) values (NULL);
+    insert into x1 (name) values (NULL);
+    delete from x1;
+  }
 }
 
+
 do_test fts3token-internal {
   execsql { SELECT fts3_tokenizer_internal_test() }
 } {ok}

diff --git a/test/pager1.test b/test/pager1.test
index 8c31e1539c36689863f9d508cf0c6492a07c7a7a..b3aacfa16778c72c7384608b90c9501613cd6841 100644 (file)
--- a/test/pager1.test
+++ b/test/pager1.test
@@ -1653,7 +1653,7 @@ for {set i 0} {$i<513} {incr i 3} {
 testvfs tv -default 1
 tv script xOpenCb
 tv filter xOpen
-proc xOpenCb {method filename} {
+proc xOpenCb {method filename args} {
   set ::file_len [string length $filename]
 }
 sqlite3 db test.db

diff --git a/test/uri.test b/test/uri.test
index b10130b593c993860143dbd9e08af7896fb120dc..44dd19445271141f214121968659b0be280df2ac 100644 (file)
--- a/test/uri.test
+++ b/test/uri.test
@@ -15,7 +15,6 @@ source $testdir/tester.tcl
 
 set testprefix uri
 db close
-
 sqlite3_shutdown
 sqlite3_config_uri 1
 
@@ -36,6 +35,9 @@ foreach {tn uri file} {
   11     file:test%2Edb                     test.db
   12     file                               file
   13     http:test.db                       http:test.db
+  14     file://xyzPWD/test.db%3Fhello      test.db?hello
+  15     file:test.db%00extra               test.db
+  16     file:test%00.db%00extra            test
 } {
   set uri  [string map [list PWD [pwd]] $uri]
   set file [string map [list PWD [pwd]] $file]
@@ -58,18 +60,33 @@ tvfs script open_method
 proc open_method {method file arglist} {
   set ::arglist $arglist
 }
-breakpoint
 foreach {tn uri kvlist} {
-  1      file:test.db?hello=world              {hello world}
-  2      file:test.db?hello&world              {hello {} world {}}
-  3      file:test.db?hello=1&world=2&vfs=tvfs {hello 1 world 2 vfs tvfs}
-  4      file:test.db?hello=1&world=2&vfs=unix {}
+  1      file:test.db?hello=world                     {hello world}
+  2      file:test.db?hello&world                     {hello {} world {}}
+  3      file:test.db?hello=1&world=2&vfs=tvfs        {hello 1 world 2 vfs tvfs}
+  4      file:test.db?hello=1&world=2&vfs=unix        {}
+  5      file:test.db?%68%65%6C%6C%6F=%77%6F%72%6C%64 {hello world}
+  6      file:test%00.db?hello%00extra=world%00ex     {hello world}
+  7      file:test%00.db?hello%00=world%00            {hello world}
+  8      file:test%00.db?=world&xyz=abc               {xyz abc}
+  9      file:test.db?%00hello=world&xyz=abc          {xyz abc}
+  10     file:test.db?hello=%00world&xyz=             {hello {} xyz {}}
+  11     file:test.db?=#ravada                        {}
+  12     file:test.db?&&&&&&&&hello=world&&&&&&&      {hello world}
 } {
   set ::arglist ""
   set DB [sqlite3_open $uri]
   do_test 2.$tn { set ::arglist } $kvlist
   sqlite3_close $DB
 }
+tvfs delete
+
+#-------------------------------------------------------------------------
+# Test that specifying a non-existent VFS raises an error.
+#
+do_test 3.1 {
+  list [catch { sqlite3 db "file:test.db?vfs=nosuchvfs" } msg] $msg
+} {1 {no such vfs: nosuchvfs}}
 
 finish_test