BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-19 17:55:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling non null-terminated string_views in LookupByKey (#8203)

Browse Source 
* Reproduce the error in a unit test

Reproduces #8200

* Overload KeyCompareWithValue to work for string-like objects

This fixes #8200.

* Extra tests

---------

Co-authored-by: Derek Bailey <derekbailey@google.com>
This commit is contained in:
mpawlowski-eyeo
2024-03-25 18:39:51 +01:00
committed by GitHub
parent 67eb95de92
commit 0cfb7eb80b
9 changed files with 117 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/cpp17/generated_cpp17/monster_test_generated.h
View File

@@ -1436,6 +1436,12 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
int KeyCompareWithValue(const char *_name) const {
return strcmp(name()->c_str(), _name);
}
template<typename StringType>
int KeyCompareWithValue(const StringType& _name) const {
if (name()->c_str() < _name) return -1;
if (_name < name()->c_str()) return 1;
return 0;
}
const ::flatbuffers::Vector<uint8_t> *inventory() const {
return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_INVENTORY);
}

6
tests/key_field/key_field_sample_generated.h
View File

@@ -598,6 +598,12 @@ struct FooTable FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
int KeyCompareWithValue(const char *_c) const {
return strcmp(c()->c_str(), _c);
}
template<typename StringType>
int KeyCompareWithValue(const StringType& _c) const {
if (c()->c_str() < _c) return -1;
if (_c < c()->c_str()) return 1;
return 0;
}
const ::flatbuffers::Vector<const keyfield::sample::Baz *> *d() const {
return GetPointer<const ::flatbuffers::Vector<const keyfield::sample::Baz *> *>(VT_D);
}

27
tests/monster_test.cpp
View File

@@ -313,6 +313,33 @@ void AccessFlatBufferTest(const uint8_t *flatbuf, size_t length, bool pooled) {
TEST_NOTNULL(vecoftables->LookupByKey("Fred"));
TEST_NOTNULL(vecoftables->LookupByKey("Wilma"));
// Verify the same objects are returned for char*-based and string-based
// lookups.
TEST_EQ(vecoftables->LookupByKey("Barney"),
vecoftables->LookupByKey(std::string("Barney")));
TEST_EQ(vecoftables->LookupByKey("Fred"),
vecoftables->LookupByKey(std::string("Fred")));
TEST_EQ(vecoftables->LookupByKey("Wilma"),
vecoftables->LookupByKey(std::string("Wilma")));
#ifdef FLATBUFFERS_HAS_STRING_VIEW
// Tests for LookupByKey with a key that is a truncated
// version of a longer, invalid key.
const std::string invalid_key = "Barney123";
std::string_view valid_truncated_key = invalid_key;
valid_truncated_key.remove_suffix(3); // "Barney"
TEST_NOTNULL(vecoftables->LookupByKey(valid_truncated_key));
TEST_EQ(vecoftables->LookupByKey("Barney"),
vecoftables->LookupByKey(valid_truncated_key));
// Tests for LookupByKey with a key that is a truncated
// version of a longer, valid key.
const std::string valid_key = "Barney";
std::string_view invalid_truncated_key = valid_key;
invalid_truncated_key.remove_suffix(3); // "Bar"
TEST_NULL(vecoftables->LookupByKey(invalid_truncated_key));
#endif // FLATBUFFERS_HAS_STRING_VIEW
// Test accessing a vector of sorted structs
auto vecofstructs = monster->testarrayofsortedstruct();
if (vecofstructs) { // not filled in monster_test.bfbs

6
tests/monster_test_generated.h
View File

@@ -1432,6 +1432,12 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
int KeyCompareWithValue(const char *_name) const {
return strcmp(name()->c_str(), _name);
}
template<typename StringType>
int KeyCompareWithValue(const StringType& _name) const {
if (name()->c_str() < _name) return -1;
if (_name < name()->c_str()) return 1;
return 0;
}
const ::flatbuffers::Vector<uint8_t> *inventory() const {
return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_INVENTORY);
}

6
tests/monster_test_suffix/ext_only/monster_test_generated.hpp
View File

@@ -1423,6 +1423,12 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
int KeyCompareWithValue(const char *_name) const {
return strcmp(name()->c_str(), _name);
}
template<typename StringType>
int KeyCompareWithValue(const StringType& _name) const {
if (name()->c_str() < _name) return -1;
if (_name < name()->c_str()) return 1;
return 0;
}
const ::flatbuffers::Vector<uint8_t> *inventory() const {
return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_INVENTORY);
}

6
tests/monster_test_suffix/filesuffix_only/monster_test_suffix.h
View File

@@ -1423,6 +1423,12 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
int KeyCompareWithValue(const char *_name) const {
return strcmp(name()->c_str(), _name);
}
template<typename StringType>
int KeyCompareWithValue(const StringType& _name) const {
if (name()->c_str() < _name) return -1;
if (_name < name()->c_str()) return 1;
return 0;
}
const ::flatbuffers::Vector<uint8_t> *inventory() const {
return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_INVENTORY);
}

6
tests/monster_test_suffix/monster_test_suffix.hpp
View File

@@ -1423,6 +1423,12 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
int KeyCompareWithValue(const char *_name) const {
return strcmp(name()->c_str(), _name);
}
template<typename StringType>
int KeyCompareWithValue(const StringType& _name) const {
if (name()->c_str() < _name) return -1;
if (_name < name()->c_str()) return 1;
return 0;
}
const ::flatbuffers::Vector<uint8_t> *inventory() const {
return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_INVENTORY);
}