From: dan Date: Thu, 27 Oct 2022 10:51:49 +0000 (+0000) Subject: Do not use sqlite3_mutex_xxx() functions in sqlite3recover.c when built with SQLITE_T... X-Git-Tag: version-3.40.0~85 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=21fd7ce098ddea35a7e5916f2e259cfe47f90655;p=thirdparty%2Fsqlite.git Do not use sqlite3_mutex_xxx() functions in sqlite3recover.c when built with SQLITE_THREADSAFE=0. FossilOrigin-Name: cd0aa27d1732abc61c8a8440118ff629f7dca185d2f515ce1f6090c49d8dc890 --- diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c index 7b2259a3ac..30d02f9ca2 100644 --- a/ext/recover/sqlite3recover.c +++ b/ext/recover/sqlite3recover.c @@ -280,6 +280,22 @@ static RecoverGlobal recover_g; */ #define RECOVER_ROWID_DEFAULT 1 +#if defined(SQLITE_THREADSAFE) && SQLITE_THREADSAFE==0 +# define recoverEnterMutex() +# define recoverLeaveMutex() +# define recoverAssertMutexHeld() +#else +static void recoverEnterMutex(void){ + sqlite3_mutex_enter(sqlite3_mutex_alloc(RECOVER_MUTEX_ID)); +} +static void recoverLeaveMutex(void){ + sqlite3_mutex_leave(sqlite3_mutex_alloc(RECOVER_MUTEX_ID)); +} +static void recoverAssertMutexHeld(void){ + assert( sqlite3_mutex_held(sqlite3_mutex_alloc(RECOVER_MUTEX_ID)) ); +} +#endif + /* ** Like strlen(). But handles NULL pointer arguments. @@ -2478,7 +2494,7 @@ static int recoverVfsShmUnmap(sqlite3_file *pFd, int deleteFlag){ static void recoverInstallWrapper(sqlite3_recover *p){ sqlite3_file *pFd = 0; assert( recover_g.pMethods==0 ); - assert( sqlite3_mutex_held( sqlite3_mutex_alloc(RECOVER_MUTEX_ID) ) ); + recoverAssertMutexHeld(); sqlite3_file_control(p->dbIn, p->zDb, SQLITE_FCNTL_FILE_POINTER, (void*)&pFd); if( pFd ){ recover_g.pMethods = pFd->pMethods; @@ -2493,7 +2509,7 @@ static void recoverInstallWrapper(sqlite3_recover *p){ ** held when this function is called. */ static void recoverUninstallWrapper(sqlite3_recover *p){ - assert( sqlite3_mutex_held( sqlite3_mutex_alloc(RECOVER_MUTEX_ID) ) ); + recoverAssertMutexHeld(); if( recover_g.pMethods ){ sqlite3_file *pFd = 0; sqlite3_file_control(p->dbIn, p->zDb,SQLITE_FCNTL_FILE_POINTER,(void*)&pFd); @@ -2518,7 +2534,7 @@ static void recoverStep(sqlite3_recover *p){ recoverSqlCallback(p, "BEGIN"); recoverSqlCallback(p, "PRAGMA writable_schema = on"); - sqlite3_mutex_enter( sqlite3_mutex_alloc(RECOVER_MUTEX_ID) ); + recoverEnterMutex(); recoverInstallWrapper(p); /* Open the output database. And register required virtual tables and @@ -2535,7 +2551,7 @@ static void recoverStep(sqlite3_recover *p){ recoverCacheSchema(p); recoverUninstallWrapper(p); - sqlite3_mutex_leave( sqlite3_mutex_alloc(RECOVER_MUTEX_ID) ); + recoverLeaveMutex(); recoverExec(p, p->dbOut, "BEGIN"); diff --git a/manifest b/manifest index 2b952a900b..97724ee2e7 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Minor\sdoc\stypo\sfixes. -D 2022-10-27T03:57:48.950 +C Do\snot\suse\ssqlite3_mutex_xxx()\sfunctions\sin\ssqlite3recover.c\swhen\sbuilt\swith\sSQLITE_THREADSAFE=0. +D 2022-10-27T10:51:49.063 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -398,7 +398,7 @@ F ext/recover/recoverpgsz.test 93e970eab05e4e89f8fd6b1bd23f9ec137ea09857e66ba0d4 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8 F ext/recover/recoverslowidx.test f356bb9fba7ffd6fc50e045e419464f0129ac6e24decf6e919584f79c3493727 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f -F ext/recover/sqlite3recover.c c91dd44f970b9e3cc37aec11e1b8eaedc93175e3021cda0db10fc3c751919e8a +F ext/recover/sqlite3recover.c 8847c27ce4ad80b327fe8266dd79087839d8ba5aeb10a03c68b199b57da00019 F ext/recover/sqlite3recover.h f698ccc94bd4da38761035415ad08c4549a408491ff9fd5f52d34d2214f64e36 F ext/recover/test_recover.c 61ec931e47abca6b2210f46239cafd9f3060741605e3d3c45a7c7a53f63dd957 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15 @@ -2052,8 +2052,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 ddd10c05c5d16d7205c347c5c1e73a75faecb2b7ec88a4a15875856765e1b143 -R 3db55ae605739ec81d57bf9021be2dd5 -U stephan -Z 9cefeec4e7d702ffe1c98da983ab0ab0 +P ed8d3f25a4d6ac04d9f7918c791d8d2c6f23ce846278ca63f8fbadb7ea27369f +R 31b949bd8120302ed6e08d715da99043 +U dan +Z 1e435f3e6e7a6ad7e9a041f4354e77c4 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 1474c49658..12a1eaf2ee 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ed8d3f25a4d6ac04d9f7918c791d8d2c6f23ce846278ca63f8fbadb7ea27369f \ No newline at end of file +cd0aa27d1732abc61c8a8440118ff629f7dca185d2f515ce1f6090c49d8dc890 \ No newline at end of file