From: dan <dan@noemail.net>
Date: Mon, 15 Apr 2019 15:41:33 +0000 (+0000)
Subject: Fix a problem with the user-auth extension and deserializing in-memory databases.
X-Git-Tag: version-3.28.0~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=46b341530e03b54d9c4ae31b81abb719f4b5f0e2;p=thirdparty%2Fsqlite.git

Fix a problem with the user-auth extension and deserializing in-memory databases.

FossilOrigin-Name: 09fa0b3c4adf7f81a777975762029ad43dbdc76b02dc32d2307e1c42465213c9
---

diff --git a/manifest b/manifest
index 8bcfa4877f..e4f193dbad 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stest\sscript\sproblem\sin\sfts5corrupt3.test.
-D 2019-04-15T13:59:08.804
+C Fix\sa\sproblem\swith\sthe\suser-auth\sextension\sand\sdeserializing\sin-memory\sdatabases.
+D 2019-04-15T15:41:33.596
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -454,7 +454,7 @@ F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
 F src/alter.c 25f54387121a0c5fd0f49b299f4070c81af8f26a84edaae6de679c4e4b71b1ff
 F src/analyze.c 58db66344a5c58dcabb57f26696f6f2993956c830446da40b444051d2fdaf644
-F src/attach.c 732d45dbf802b79f66503614a23e862887231d4d4937eac7c28a92c6fdb78e1f
+F src/attach.c 78e986baee90cb7b83fb9eafa79c22581a8ada14030fd633b0683c95cf11213c
 F src/auth.c 0fac71038875693a937e506bceb492c5f136dd7b1249fbd4ae70b4e8da14f9df
 F src/backup.c 78d3cecfbe28230a3a9a1793e2ead609f469be43e8f486ca996006be551857ab
 F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
@@ -1818,7 +1818,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 0bab4ece6e81916d0f7255a8e553b8ca040cb8a96ab21e294212e232119f8ddc
-R 17255f201fee712c437d0bc74b54b3db
+P 734192d876e0489cb34e454aaa4a9c6858145791a49959b31dee2917a8e41a7d
+R ccb16b8d5f092c09f18270d0885ef69e
 U dan
-Z b7139ecd0efbf2427baaf4b0ae95a55d
+Z 8977b16e1e0f2a3bdfa5e727ba8e15b2
diff --git a/manifest.uuid b/manifest.uuid
index 1bfa42692b..847e5f4d36 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-734192d876e0489cb34e454aaa4a9c6858145791a49959b31dee2917a8e41a7d
\ No newline at end of file
+09fa0b3c4adf7f81a777975762029ad43dbdc76b02dc32d2307e1c42465213c9
\ No newline at end of file
diff --git a/src/attach.c b/src/attach.c
index 65b98a623f..55e0eb5363 100644
--- a/src/attach.c
+++ b/src/attach.c
@@ -241,7 +241,7 @@ static void attachFunc(
     assert( zErrDyn==0 || rc!=SQLITE_OK );
   }
 #ifdef SQLITE_USER_AUTHENTICATION
-  if( rc==SQLITE_OK ){
+  if( rc==SQLITE_OK && !REOPEN_AS_MEMDB(db) ){
     u8 newAuth = 0;
     rc = sqlite3UserAuthCheckLogin(db, zName, &newAuth);
     if( newAuth<db->auth.authLevel ){