From: drh <drh@noemail.net>
Date: Sat, 1 Feb 2020 14:29:18 +0000 (+0000)
Subject: Fix a problem in sqlite3CodecQueryParameters() that was introduced by the
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dbbb9343ebbf642be375286df0f7b501c3cd00dd;p=thirdparty%2Fsqlite.git

Fix a problem in sqlite3CodecQueryParameters() that was introduced by the
query parameter encoding changes for the 3.31.1 release.

FossilOrigin-Name: 1240ee4f6f612080d1805be6bc96c26e84d3420b5158a966d2eb2e518c249e8f
---

diff --git a/manifest b/manifest
index 6b473624c8..dd9de2bc70 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sversion\s3.31.1
-D 2020-02-01T00:08:28.488
+C Fix\sa\sproblem\sin\ssqlite3CodecQueryParameters()\sthat\swas\sintroduced\sby\sthe\nquery\sparameter\sencoding\schanges\sfor\sthe\s3.31.1\srelease.
+D 2020-02-01T14:29:18.633
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -498,7 +498,7 @@ F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c 2fe4d7f67078a68650f16e4efe73207899e21702e6b9d2e8ad1894c76dcad352
 F src/legacy.c f69590f141eabd2dc787710264ccfa4374fac991ea1ca2120a2550c0ffe32afd
 F src/loadext.c 8cd803f1747c03a50b32fe87ebfb5851998d0cdafefe02737daa95e0616b42bb
-F src/main.c 4adc083bab6d17086e11121341d981020d6ae14c078ad83882fe9a317e36c969
+F src/main.c eeb87fbe8d5e8b32f310ee94196537ba92af5a3ac6679c9fc1315c3d9aba4cfd
 F src/malloc.c eaa4dc9602ce28b077f7de2eb275db2be270c5cc56d7fec5466301bd9b80e2f5
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@ -1862,7 +1862,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 0eae87ad11107f420b00958fa5a9b8037b775f0586e9fb1e2d5f6c04d7ae4afc 3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837bb4d6
-R c2517ca13f1f9419d56182d6cc87f6b4
-U numist
-Z eba5af3ae194a88d3d29362000183ff6
+P d250d085fa4bd6509ab074d15f1c11fcc15d0cc150e5e429b191eb5a92e0ac1e
+Q +cc65ca541265bd7061ed8f5ec9a54f3c384c41019c5ea1c68dcaabeff3495839
+R b51b0d674235471fb79c7359edf6c278
+U drh
+Z 00bbc7b53b4a9a74b91ec6cadae32fc8
diff --git a/manifest.uuid b/manifest.uuid
index 144adef4fe..c203d95e52 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d250d085fa4bd6509ab074d15f1c11fcc15d0cc150e5e429b191eb5a92e0ac1e
\ No newline at end of file
+1240ee4f6f612080d1805be6bc96c26e84d3420b5158a966d2eb2e518c249e8f
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index 6818c38f28..de9f8b60b4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3087,6 +3087,21 @@ static void enableAutoLogging(
 }
 #endif
 
+/*
+** This routine does the core work of extracting URI parameters from a
+** database filename for the sqlite3_uri_parameter() interface.
+*/
+static const char *uriParameter(const char *zFilename, const char *zParam){
+  zFilename += sqlite3Strlen30(zFilename) + 1;
+  while( zFilename[0] ){
+    int x = strcmp(zFilename, zParam);
+    zFilename += sqlite3Strlen30(zFilename) + 1;
+    if( x==0 ) return zFilename;
+    zFilename += sqlite3Strlen30(zFilename) + 1;
+  }
+  return 0;
+}
+
 #if defined(SQLITE_HAS_CODEC)
 /*
 ** Process URI filename query parameters relevant to the SQLite Encryption
@@ -3099,7 +3114,9 @@ int sqlite3CodecQueryParameters(
   const char *zUri       /* URI filename */
 ){
   const char *zKey;
-  if( (zKey = sqlite3_uri_parameter(zUri, "hexkey"))!=0 && zKey[0] ){
+  if( zUri==0 ){
+    return 0;
+  }else if( (zKey = uriParameter(zUri, "hexkey"))!=0 && zKey[0] ){
     u8 iByte;
     int i;
     char zDecoded[40];
@@ -3109,10 +3126,10 @@ int sqlite3CodecQueryParameters(
     }
     sqlite3_key_v2(db, zDb, zDecoded, i/2);
     return 1;
-  }else if( (zKey = sqlite3_uri_parameter(zUri, "key"))!=0 ){
+  }else if( (zKey = uriParameter(zUri, "key"))!=0 ){
     sqlite3_key_v2(db, zDb, zKey, sqlite3Strlen30(zKey));
     return 1;
-  }else if( (zKey = sqlite3_uri_parameter(zUri, "textkey"))!=0 ){
+  }else if( (zKey = uriParameter(zUri, "textkey"))!=0 ){
     sqlite3_key_v2(db, zDb, zKey, -1);
     return 1;
   }else{
@@ -4401,14 +4418,7 @@ static const char *databaseName(const char *zName){
 const char *sqlite3_uri_parameter(const char *zFilename, const char *zParam){
   if( zFilename==0 || zParam==0 ) return 0;
   zFilename = databaseName(zFilename);
-  zFilename += sqlite3Strlen30(zFilename) + 1;
-  while( zFilename[0] ){
-    int x = strcmp(zFilename, zParam);
-    zFilename += sqlite3Strlen30(zFilename) + 1;
-    if( x==0 ) return zFilename;
-    zFilename += sqlite3Strlen30(zFilename) + 1;
-  }
-  return 0;
+  return uriParameter(zFilename, zParam);
 }
 
 /*