tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix string indexer reallocation bug (#1666)

Browse Source
This commit is contained in:
Stefan Karschti
2023-09-20 19:04:19 +03:00
committed by GitHub
parent 713edd2c8e
commit 5900d69e92
5 changed files with 68 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
test/util/string_indexer.test.cpp
View File

@@ -30,7 +30,7 @@ TEST(StringIndexer, GetString) {
EXPECT_EQ(id1, 0);
EXPECT_EQ(StringIndexer::size(), 1);
const std::string str1 = StringIndexer::get(id1);
const auto str1 = StringIndexer::get(id1);
EXPECT_EQ(str, str1);
const auto str2 = str;
@@ -38,13 +38,48 @@ TEST(StringIndexer, GetString) {
EXPECT_EQ(id1, id2);
}
TEST(StringIndexer, Reallocate) {
StringIndexer::clear();
EXPECT_EQ(StringIndexer::size(), 0);
constexpr auto str = "reallocate test string1";
const auto id1 = StringIndexer::get(str);
EXPECT_EQ(id1, 0);
EXPECT_EQ(StringIndexer::size(), 1);
// force reallocation. assume capacity: 100 strings, 100 * 32 bytes buffer space
constexpr auto N = 1000;
auto string_for_i = [](int i) -> std::string {
using namespace std::string_literals;
return "1234567890"s + "1234567890"s + "1234567890"s + "---" + std::to_string(i);
};
for (auto i = 1; i < N; ++i) {
StringIndexer::get(string_for_i(i));
}
EXPECT_EQ(StringIndexer::size(), N);
const auto str1 = StringIndexer::get(id1);
EXPECT_EQ(str, str1);
for (auto i = 1; i < N; ++i) {
const auto strN1 = StringIndexer::get(i);
EXPECT_EQ(strN1, string_for_i(i));
}
}
TEST(StringIndexer, GetOOBIdentity) {
StringIndexer::clear();
EXPECT_EQ(StringIndexer::size(), 0);
std::string str;
#ifndef NDEBUG
EXPECT_DEATH_IF_SUPPORTED(str = StringIndexer::get(42), "id < identityToString.size()");
#endif
EXPECT_TRUE(str.empty());
#ifndef NDEBUG
EXPECT_DEATH_IF_SUPPORTED(str = StringIndexer::get(-1), "id < identityToString.size()");
#endif
EXPECT_TRUE(str.empty());
}