valitydev/osquery-1
14
0
Fork 0
mirror of https://github.com/valitydev/osquery-1.git synced 2024-11-07 09:58:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Fix #3831] Do not lock kAttachMutex within shell callbacks (#3837)

Browse Source
This commit is contained in:
Teddy Reed 2017-10-16 13:46:14 -07:00 committed by Nick Anderson
parent cd88cecc9a
commit 676430b019
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osquery/devtools/shell.cpp
View File

@ -791,8 +791,6 @@ static int shell_exec(
while (zSql[0] && (SQLITE_OK == rc)) {
/* A lock for attaching virtual tables, but also the SQL object states. */
osquery::RecursiveLock lock(osquery::kAttachMutex);
rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, &zLeftover);
if (SQLITE_OK != rc) {
if (pzErrMsg) {

3
osquery/main/main.cpp
View File

@ -123,7 +123,8 @@ int startShell(osquery::Initializer& runner, int argc, char* argv[]) {
osquery::FLAGS_disable_events = true;
osquery::FLAGS_disable_caching = true;
// The shell may have loaded table extensions, if not, disable the manager.
if (!osquery::Watcher::get().hasManagedExtensions()) {
if (!osquery::Watcher::get().hasManagedExtensions() &&
Flag::isDefault("disable_extensions")) {
osquery::FLAGS_disable_extensions = true;
}
}