facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 14:58:03 +03:00
Code Issues Projects Releases Wiki Activity

fix an assertion violation in GlobBenchmark

Browse Source 
Summary:
In dev mode, the glob benchmark failed inside of
folly::Range::operator[] because asserting null termination
technically violates the bounds check.

Reviewed By: simpkins

Differential Revision: D20268416

fbshipit-source-id: ee9b16a6eb9882e850631aa9d83fffe7b6fb67c3
This commit is contained in:
Chad Austin 2020-03-16 13:24:59 -07:00 committed by Facebook GitHub Bot
parent 5f7a50bdb4
commit 97f2921deb
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
eden/fs/model/git/test/GlobBenchmark.cpp
View File

@ -14,7 +14,7 @@
using namespace facebook::eden;
std::vector<folly::StringPiece> basenameCorpus = {
std::vector<std::string> basenameCorpus = {
"README",
"README.txt",
"test.c",
@ -26,7 +26,7 @@ std::vector<folly::StringPiece> basenameCorpus = {
"BUCK",
};
std::vector<folly::StringPiece> fullnameCorpus = {
std::vector<std::string> fullnameCorpus = {
"kernel/irq/manage.c",
"kernel/power/console.c",
"kernel/time/tick-internal.h",
@ -75,7 +75,7 @@ class GlobMatcherImpl {
matcher_ = GlobMatcher::create(glob, GlobOptions::DEFAULT).value();
}
bool match(folly::StringPiece input) {
bool match(const std::string& input) {
return matcher_.match(input);
}
@ -90,11 +90,8 @@ class WildmatchImpl {
pattern_ = glob.str();
}
bool match(folly::StringPiece input) {
// wildmatch only supports null terminated strings, so we really
// require that the StringPiece point at data that is null terminated.
assert(input[input.size()] == '\0');
return wildmatch(pattern_.c_str(), input.data(), WM_PATHNAME, nullptr);
bool match(const std::string& input) {
return wildmatch(pattern_.c_str(), input.c_str(), WM_PATHNAME, nullptr);
}
private:
@ -108,7 +105,7 @@ class FixedStringImpl {
pattern_ = match.str();
}
bool match(folly::StringPiece input) {
bool match(const std::string& input) {
return input.size() == pattern_.size() &&
memcmp(pattern_.data(), input.data(), input.size()) == 0;
}