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

Fix potential hang with recursive globbing

Browse Source
This commit is contained in:
Teddy Reed 2015-09-28 17:50:25 -07:00
parent cbf9a17b4a
commit 66888de80a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osquery/filesystem/filesystem.cpp
View File

@ -37,6 +37,8 @@ FLAG(bool, read_user_links, true, "Read user-owned filesystem links");
// See reference #1382 for reasons why someone would allow unsafe.
HIDDEN_FLAG(bool, allow_unsafe, false, "Allow unsafe executable permissions");
static const size_t kMaxRecursiveGlobs = 64;
Status writeTextFile(const fs::path& path,
const std::string& content,
int permissions,
@ -183,7 +185,8 @@ static void genGlobs(std::string path,
replaceGlobWildcards(path);
// Generate a glob set and recurse for double star.
while (true) {
size_t glob_index = 0;
while (++glob_index < kMaxRecursiveGlobs) {
glob_t data;
glob(path.c_str(), GLOB_TILDE | GLOB_MARK | GLOB_BRACE, nullptr, &data);
size_t count = data.gl_pathc;