From: drh <drh@noemail.net>
Date: Sat, 17 Oct 2020 22:13:16 +0000 (+0000)
Subject: Fix the SQLITE_DESERIALIZE_FREEONCLOSE flag so that it works as it is
X-Git-Tag: version-3.34.0~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff01ee34c9298f6461e1b282eea2178c08b7d16a;p=thirdparty%2Fsqlite.git

Fix the SQLITE_DESERIALIZE_FREEONCLOSE flag so that it works as it is
documented to work.
See [forum:/forumpost/ba1dff667a|forum post ba1dff667a]

FossilOrigin-Name: d6fac8a1d3efeb2c4f03dae437b5b314765c93770a70603803a8039291dbcabb
---

diff --git a/manifest b/manifest
index 757d1af7a1..11d0ac4965 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sincorrect\sprintf()\sin\sdebugging\slogic\sin\swhere.c.\nProblem\sreported\s[forum:/info/80a9c47769772207|by\sforum\spost\s80a9c47769772207].
-D 2020-10-17T19:09:04.842
+C Fix\sthe\sSQLITE_DESERIALIZE_FREEONCLOSE\sflag\sso\sthat\sit\sworks\sas\sit\sis\ndocumented\sto\swork.\nSee\s[forum:/forumpost/ba1dff667a|forum\spost\sba1dff667a]
+D 2020-10-17T22:13:16.902
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -508,7 +508,7 @@ F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
 F src/mem2.c b93b8762ab999a29ae7751532dadf0a1ac78040308a5fb1d17fcc365171d67eb
 F src/mem3.c 30301196cace2a085cbedee1326a49f4b26deff0af68774ca82c1f7c06fda4f6
 F src/mem5.c 9bf955937b07f8c32541c8a9991f33ce3173d944
-F src/memdb.c d58e398e315e88f95f8d07d17e80ab11259ebd6d1a10397434329eeabd1985e3
+F src/memdb.c 23e8f0b975e91e23f60794935252bec2040d8db09f598fd738d5903dd6c0143f
 F src/memjournal.c 90b2ca7e2f465d57c16b69d15a9f3e3294af61088eb4938f2f7664d5ac50f813
 F src/msvc.h 3a15918220367a8876be3fa4f2abe423a861491e84b864fb2b7426bf022a28f8
 F src/mutex.c 5e3409715552348732e97b9194abe92fdfcd934cfb681df4ba0ab87ac6c18d25
@@ -1882,7 +1882,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 ed3bb818f58b75c087f2875331ec944397b6c61a5b14d8af4b9ec6f376bd1872
-R 13274d6a012cd30d7f0c6f8ba7eefeac
+P 883da4dadc88809192e4ed2f753f8883471fb43aa330bc58b017c66e1acedc6c
+R 9776eedd2cd9c8f1b609b4bc8dd4a475
 U drh
-Z 1092a14e3c313f12740a7b1fa870b8ab
+Z 34fe04425a6d42f6096c739434aec808
diff --git a/manifest.uuid b/manifest.uuid
index 9056a726e6..6e834086a2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-883da4dadc88809192e4ed2f753f8883471fb43aa330bc58b017c66e1acedc6c
\ No newline at end of file
+d6fac8a1d3efeb2c4f03dae437b5b314765c93770a70603803a8039291dbcabb
\ No newline at end of file
diff --git a/src/memdb.c b/src/memdb.c
index dc969a47e8..d07023dbab 100644
--- a/src/memdb.c
+++ b/src/memdb.c
@@ -126,11 +126,14 @@ static const sqlite3_io_methods memdb_io_methods = {
 ** Close an memdb-file.
 **
 ** The pData pointer is owned by the application, so there is nothing
-** to free.
+** to free.  Unless the SQLITE_DESERIALIZE_FREEONCLOSE flag is set,
+** in which case we own the pData pointer and need to free it.
 */
 static int memdbClose(sqlite3_file *pFile){
   MemFile *p = (MemFile *)pFile;
-  if( p->mFlags & SQLITE_DESERIALIZE_FREEONCLOSE ) sqlite3_free(p->aData);
+  if( p->mFlags & SQLITE_DESERIALIZE_FREEONCLOSE ){
+    sqlite3_free(p->aData);
+  }
   return SQLITE_OK;
 }
 
@@ -589,6 +592,7 @@ int sqlite3_deserialize(
     rc = SQLITE_ERROR;
   }else{
     p->aData = pData;
+    pData = 0;
     p->sz = szDb;
     p->szAlloc = szBuf;
     p->szMax = szBuf;
@@ -601,6 +605,9 @@ int sqlite3_deserialize(
 
 end_deserialize:
   sqlite3_finalize(pStmt);
+  if( pData && (mFlags & SQLITE_DESERIALIZE_FREEONCLOSE)!=0 ){
+    sqlite3_free(pData);
+  }
   sqlite3_mutex_leave(db->mutex);
   return rc;
 }