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

cpp/pmtiles.hpp: fix build error with big-endian, and add extra sanitfy check

Browse Source
This commit is contained in:
Even Rouault
2023-06-14 23:52:04 +02:00
parent 6899e23f06
commit fe7e7db559
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cpp/pmtiles.hpp
View File

@@ -25,7 +25,7 @@ const uint8_t COMPRESSION_ZSTD = 0x4;
#ifdef PMTILES_MSB #ifdef PMTILES_MSB
template<class T> template<class T>
inline void swap_byte_order(T* ptr) { inline void swap_byte_order_if_msb(T* ptr) {
unsigned char* ptrBytes = reinterpret_cast<unsigned char*>(ptr); unsigned char* ptrBytes = reinterpret_cast<unsigned char*>(ptr);
for (size_t i = 0; i < sizeof(T)/2; ++i) { for (size_t i = 0; i < sizeof(T)/2; ++i) {
std::swap(ptrBytes[i], ptrBytes[sizeof(T)-1-i]); std::swap(ptrBytes[i], ptrBytes[sizeof(T)-1-i]);
@@ -492,7 +492,11 @@ inline std::vector<entryv3> deserialize_directory(const std::string &decompresse
uint64_t last_id = 0; uint64_t last_id = 0;
for (size_t i = 0; i < num_entries; i++) { for (size_t i = 0; i < num_entries; i++) {
uint64_t tile_id = last_id + decode_varint(&t, end); const uint64_t val = decode_varint(&t, end);
if (val > std::numeric_limits<uint64_t>::max() - last_id) {
throw malformed_directory_exception();
}
const uint64_t tile_id = last_id + val;
result[i].tile_id = tile_id; result[i].tile_id = tile_id;
last_id = tile_id; last_id = tile_id;
} }