weaselab/conflict-set
2
0
Fork 0
Code Issues 4 Packages Releases 13 Activity

We need 8 hex chars for 4 byte keys

Browse Source
This commit is contained in:
Andrew Noyes
2024-01-21 16:49:03 -08:00
parent 5a3740a733
commit 16d46d3de6
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ConflictSet.cpp
View File

@@ -502,7 +502,9 @@ Node *createNode(const Key &key, Node *parent, int64_t pointVersion,
result->priority &= 0xff;
#endif
result->len = key.len;
memcpy(result + 1, key.p, key.len);
if (key.len > 0) {
memcpy(result + 1, key.p, key.len);
}
return result;
}
@@ -738,7 +740,7 @@ void lastLeqMulti(Arena &arena, Node *root, std::span<Key> keys,
}
[[maybe_unused]] Key toKey(Arena &arena, int n) {
constexpr int kMaxLength = 4;
constexpr int kMaxLength = 8;
int i = kMaxLength;
uint8_t *itoaBuf = new (arena) uint8_t[kMaxLength];
memset(itoaBuf, '0', kMaxLength);
@@ -750,7 +752,7 @@ void lastLeqMulti(Arena &arena, Node *root, std::span<Key> keys,
}
[[maybe_unused]] Key toKeyAfter(Arena &arena, int n) {
constexpr int kMaxLength = 4;
constexpr int kMaxLength = 8;
int i = kMaxLength;
uint8_t *itoaBuf = new (arena) uint8_t[kMaxLength + 1];
memset(itoaBuf, '0', kMaxLength);
@@ -964,7 +966,8 @@ struct __attribute__((__visibility__("hidden"))) ConflictSet::Impl {
// We could interleave the iteration in ::next, but we'd need a careful
// analysis for correctness and it's unlikely to be worthwhile.
auto *prev = ::next(newNode, false);
// The empty key always exists. If *key is empty then we won't reach here.
// The empty key always exists. If key is empty then we won't reach
// here.
assert(prev != nullptr);
assert(prev->rangeVersion <= writeVersion);
newNode->rangeVersion = prev->rangeVersion;
@@ -1251,21 +1254,22 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
int numWrites = gArbitrary.bounded(10);
int64_t v = ++writeVersion;
auto *writes = new (arena) ConflictSet::WriteRange[numWrites];
std::set<std::string_view, std::less<std::string_view>, ArenaAlloc<std::string_view>> keys{
ArenaAlloc<int>(&arena)};
std::set<std::string_view, std::less<std::string_view>,
ArenaAlloc<std::string_view>>
keys{ArenaAlloc<int>(&arena)};
while (int(keys.size()) < numWrites) {
if (!gArbitrary.hasEntropy()) {
// Tell the fuzzer it's not interesting
return -1;
}
int keyLen = gArbitrary.bounded(8);
auto* begin = new (arena) uint8_t[keyLen];
auto *begin = new (arena) uint8_t[keyLen];
gArbitrary.randomHex(begin, keyLen);
keys.insert(std::string_view((const char*)begin, keyLen));
keys.insert(std::string_view((const char *)begin, keyLen));
}
auto iter = keys.begin();
for (int i = 0; i < numWrites; ++i) {
writes[i].begin.p = (const uint8_t*)iter->data();
writes[i].begin.p = (const uint8_t *)iter->data();
writes[i].begin.len = iter->size();
writes[i].end.len = 0;
writes[i].writeVersion = v;
@@ -1281,21 +1285,22 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
int numReads = gArbitrary.bounded(10);
int64_t v = writeVersion - gArbitrary.bounded(10);
auto *reads = new (arena) ConflictSet::ReadRange[numReads];
std::set<std::string_view, std::less<std::string_view>, ArenaAlloc<std::string_view>> keys{
ArenaAlloc<int>(&arena)};
std::set<std::string_view, std::less<std::string_view>,
ArenaAlloc<std::string_view>>
keys{ArenaAlloc<int>(&arena)};
while (int(keys.size()) < numReads) {
if (!gArbitrary.hasEntropy()) {
// Tell the fuzzer it's not interesting
return -1;
}
int keyLen = gArbitrary.bounded(8);
auto* begin = new (arena) uint8_t[keyLen];
auto *begin = new (arena) uint8_t[keyLen];
gArbitrary.randomHex(begin, keyLen);
keys.insert(std::string_view((const char*)begin, keyLen));
keys.insert(std::string_view((const char *)begin, keyLen));
}
auto iter = keys.begin();
for (int i = 0; i < numReads; ++i) {
reads[i].begin.p = (const uint8_t*)iter->data();
reads[i].begin.p = (const uint8_t *)iter->data();
reads[i].begin.len = iter->size();
reads[i].end.len = 0;
reads[i].readVersion = v;