From: drh <>
Date: Wed, 12 May 2021 02:52:20 +0000 (+0000)
Subject: Respond correctly to OOM during mutex allocation.
X-Git-Tag: version-3.36.0~109^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d344f944edaaadb71dc34d7c948989a75afe1db;p=thirdparty%2Fsqlite.git

Respond correctly to OOM during mutex allocation.

FossilOrigin-Name: 98dae595d861941bb0bcd12126ee02492587c466e6da579a58b5dc4a4d655917
---

diff --git a/manifest b/manifest
index 9d52dbba55..e0494487e8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Mark\san\sunreachable\sbranch\sas\sNEVER().
-D 2021-05-12T02:09:01.176
+C Respond\scorrectly\sto\sOOM\sduring\smutex\sallocation.
+D 2021-05-12T02:52:20.461
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -514,7 +514,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 653a1f08f80ffbbf841133dfeb9e3893a14a8a02b3d2b48c80260b3a87741f12
+F src/memdb.c 0c95e0299cc81e19d8695d2e7b81c338a5e77d083aa7849643eafcc2a3b1115a
 F src/memjournal.c 431c70a111223a8a6e2e7e9f014afc6c88d818d357d866afc563195f2277d50e
 F src/msvc.h 3a15918220367a8876be3fa4f2abe423a861491e84b864fb2b7426bf022a28f8
 F src/mutex.c 5e3409715552348732e97b9194abe92fdfcd934cfb681df4ba0ab87ac6c18d25
@@ -1912,7 +1912,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 8f9f1cbc4468d07d693b418be4d89771fd240ee4af34395d7da5b7709fe88f37
-R 5ec634af0b61ea5b818e7e84910648b7
+P 6c20d9d4b7c7986e8404142974a91dce7514ca574ee52ed5d036367aad396689
+R 1441e09faa39fd11227f415ae28549ff
 U drh
-Z 4d8ae1d2c5339d2f7192cb6bd5f6074e
+Z 0e90b0427259cb6d9f6183399dca20f9
diff --git a/manifest.uuid b/manifest.uuid
index 5409a06a5e..f1207520d2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6c20d9d4b7c7986e8404142974a91dce7514ca574ee52ed5d036367aad396689
\ No newline at end of file
+98dae595d861941bb0bcd12126ee02492587c466e6da579a58b5dc4a4d655917
\ No newline at end of file
diff --git a/src/memdb.c b/src/memdb.c
index 284ba4917d..d2509a7e32 100644
--- a/src/memdb.c
+++ b/src/memdb.c
@@ -204,7 +204,9 @@ static int memdbClose(sqlite3_file *pFile){
     }
     if( p->zFName ){
       int i;
+#ifndef SQLITE_MUTEX_OMIT
       sqlite3_mutex *pVfsMutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_VFS1);
+#endif
       sqlite3_mutex_enter(pVfsMutex);
       for(i=0; ALWAYS(i<memdb_g.nMemStore); i++){
         if( memdb_g.apMemStore[i]==p ){
@@ -489,7 +491,9 @@ static int memdbOpen(
   szName = sqlite3Strlen30(zName);
   if( szName>1 && zName[0]=='/' ){
     int i;
+#ifndef SQLITE_MUTEX_OMIT
     sqlite3_mutex *pVfsMutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_VFS1);
+#endif
     sqlite3_mutex_enter(pVfsMutex);
     for(i=0; i<memdb_g.nMemStore; i++){
       if( strcmp(memdb_g.apMemStore[i]->zFName,zName)==0 ){
@@ -519,6 +523,12 @@ static int memdbOpen(
       p->zFName = (char*)&p[1];
       memcpy(p->zFName, zName, szName+1);
       p->pMutex = sqlite3_mutex_alloc(SQLITE_MUTEX_FAST);
+      if( p->pMutex==0 ){
+        memdb_g.nMemStore--;
+        sqlite3_free(p);
+        sqlite3_mutex_leave(pVfsMutex);
+        return SQLITE_NOMEM;
+      }
       p->nRef = 1;
       memdbEnter(p);
     }else{