Skip to content

fuzz: avoid leaking time system singleton. #5850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmarantz merged 4 commits into from
Feb 6, 2019
Merged

fuzz: avoid leaking time system singleton. #5850

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
76790a5
fuzz: avoid leaking time system singleton.
htuch Feb 5, 2019
be1f062
RELEASE_ASSERT.
htuch Feb 5, 2019
5b564ef
Undo RELEASE_ASSERT, jmarantz@ will fix the implied fails.
htuch Feb 5, 2019
1780602
Scope stats.
htuch Feb 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 19 additions & 15 deletions test/fuzz/main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,25 @@ int main(int argc, char** argv) {
RELEASE_ASSERT(argc >= 2, "");
// Consider any file after the test path which doesn't have a - prefix to be a corpus entry.
uint32_t input_args = 0;
Envoy::Stats::IsolatedStoreImpl stats_store;
Envoy::Api::ApiPtr api = Envoy::Api::createApiForTest(stats_store);
for (int i = 1; i < argc; ++i) {
const std::string arg{argv[i]};
if (arg.empty() || arg[0] == '-') {
break;
}
++input_args;
// Outputs from envoy_directory_genrule might be directories or we might
// have artisanal files.
if (api->fileSystem().directoryExists(arg)) {
const auto paths = Envoy::TestUtility::listFiles(arg, true);
Envoy::test_corpus_.insert(Envoy::test_corpus_.begin(), paths.begin(), paths.end());
} else {
Envoy::test_corpus_.emplace_back(arg);
// Ensure we cleanup API resources before we jump into the tests, the test API creates a singleton
// time system that we don't want to leak into gtest.
{
Copy link
Contributor

@jmarantz jmarantz Feb 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you sink stats_store too?

Envoy::Stats::IsolatedStoreImpl stats_store;
Envoy::Api::ApiPtr api = Envoy::Api::createApiForTest(stats_store);
for (int i = 1; i < argc; ++i) {
const std::string arg{argv[i]};
if (arg.empty() || arg[0] == '-') {
break;
}
++input_args;
// Outputs from envoy_directory_genrule might be directories or we might
// have artisanal files.
if (api->fileSystem().directoryExists(arg)) {
const auto paths = Envoy::TestUtility::listFiles(arg, true);
Envoy::test_corpus_.insert(Envoy::test_corpus_.begin(), paths.begin(), paths.end());
} else {
Envoy::test_corpus_.emplace_back(arg);
}
}
}
argc -= input_args;
Expand Down