From: drh <drh@noemail.net>
Date: Mon, 23 Jul 2018 22:55:10 +0000 (+0000)
Subject: Return an SQLITE_NOMEM error if the locking mutex fails to allocate.
X-Git-Tag: version-3.25.0~96^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fseparate-lock-mutex;p=thirdparty%2Fsqlite.git

Return an SQLITE_NOMEM error if the locking mutex fails to allocate.

FossilOrigin-Name: 1c94834879be0601ac40ef3c4fb1b140f7737e89af7808f2f1db4ceb3daae19f
---

diff --git a/manifest b/manifest
index 572f99e747..89a7752c5f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C First\sattempt\sat\sreducing\smutex\scontention\sin\sthe\sunix\sVFS\sby\sproviding\na\sseparate\smutex\sfor\seach\sunixInodeInfo\sobject.
-D 2018-07-23T21:10:37.802
+C Return\san\sSQLITE_NOMEM\serror\sif\sthe\slocking\smutex\sfails\sto\sallocate.
+D 2018-07-23T22:55:10.825
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 0a3a6c81e6fcb969ff9106e882f0a08547014ba463cb6beca4c4efaecc924ee6
@@ -481,7 +481,7 @@ F src/os.c 8aeb0b0f40f8f5b0da03fe49706695adaf42d2f516ab95abc72e86c245e119de
 F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
-F src/os_unix.c c275a32d1112973457908bee494ae0444468c0b96c07057913ade6d69781dab3
+F src/os_unix.c d9cf5ae0c79f31019d8325e8736c83914aeed64d8327a8d91a62b6439b748948
 F src/os_win.c 070cdbb400097c6cda54aa005356095afdc2f3ee691d17192c54724ef146a971
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c 76d29b8a960dcb8b67210f095899d91e4a90673a6674ea58cfd1115b705a7fb9
@@ -1750,10 +1750,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 8607b84a5c53d8c9218c90802160a3000f1138b1f188e411a3af46253e0a69cc
-R acece63ae9d3f4b29a8a0d5614555a1e
-T *branch * separate-lock-mutex
-T *sym-separate-lock-mutex *
-T -sym-trunk *
+P f69afaf00a659cd768a863c5f4a1d527f01187e037240da0ada527cb52c5afe8
+R 545987b031198ddb83ad8081fc620520
 U drh
-Z c02c3e5d8cc1425b437d3294ad5c5e34
+Z 436188ee6c79b5ad3607625e6db74233
diff --git a/manifest.uuid b/manifest.uuid
index de8e1e71e2..273911bebb 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f69afaf00a659cd768a863c5f4a1d527f01187e037240da0ada527cb52c5afe8
\ No newline at end of file
+1c94834879be0601ac40ef3c4fb1b140f7737e89af7808f2f1db4ceb3daae19f
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index 48067f4cc3..aacca93d14 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -1373,7 +1373,13 @@ static int findInodeInfo(
     }
     memset(pInode, 0, sizeof(*pInode));
     memcpy(&pInode->fileId, &fileId, sizeof(fileId));
-    pInode->pLockMutex = sqlite3_mutex_alloc(SQLITE_MUTEX_FAST);
+    if( sqlite3GlobalConfig.bCoreMutex ){
+      pInode->pLockMutex = sqlite3_mutex_alloc(SQLITE_MUTEX_FAST);
+      if( pInode->pLockMutex==0 ){
+        sqlite3_free(pInode);
+        return SQLITE_NOMEM_BKPT;
+      }
+    }
     pInode->nRef = 1;
     pInode->pNext = inodeList;
     pInode->pPrev = 0;