mirrors/PMTiles
1
0
Fork 0
mirror of https://github.com/protomaps/PMTiles.git synced 2026-02-04 19:01:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

c++: fix off-by-one error causing out-of-bounds access

Browse Source
This commit is contained in:
Brandon Liu
2023-05-03 12:58:29 +08:00
parent 9b0e473d30
commit 7ea69442b3
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cpp/pmtiles.hpp
View File

@@ -484,7 +484,7 @@ inline std::tuple<std::string, std::string, int> build_root_leaves(const std::fu
std::vector<pmtiles::entryv3> root_entries; std::vector<pmtiles::entryv3> root_entries;
std::string leaves_bytes; std::string leaves_bytes;
int num_leaves = 0; int num_leaves = 0;
for (size_t i = 0; i <= entries.size(); i += leaf_size) { for (size_t i = 0; i < entries.size(); i += leaf_size) {
num_leaves++; num_leaves++;
int end = i + leaf_size; int end = i + leaf_size;
if (i + leaf_size > entries.size()) { if (i + leaf_size > entries.size()) {

11
cpp/test.cpp
View File

@@ -196,6 +196,16 @@ string mydecompress(const string &input, uint8_t compression) {
return input; return input;
} }
MU_TEST(test_build_dirs_one) {
vector<entryv3> entries;
entries.push_back(entryv3(0, 0, 1, 2));
string root_bytes;
string leaves_bytes;
int num_leaves;
tie(root_bytes, leaves_bytes, num_leaves) = build_root_leaves(&mycompress, pmtiles::COMPRESSION_NONE, entries, 1);
mu_check(num_leaves == 1);
}
MU_TEST(test_build_dirs) { MU_TEST(test_build_dirs) {
vector<entryv3> entries; vector<entryv3> entries;
for (int i = 0; i < 100000; i += 2) { for (int i = 0; i < 100000; i += 2) {
@@ -259,6 +269,7 @@ MU_TEST_SUITE(test_suite) {
MU_RUN_TEST(test_serialize_header); MU_RUN_TEST(test_serialize_header);
MU_RUN_TEST(test_deserialize_header); MU_RUN_TEST(test_deserialize_header);
MU_RUN_TEST(test_build_dirs); MU_RUN_TEST(test_build_dirs);
MU_RUN_TEST(test_build_dirs_one);
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {