ExternalVendorCode/tippecanoe
1
0
Fork 0
mirror of https://github.com/mapbox/tippecanoe.git synced 2025-02-01 08:47:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Guard against null data in the mbtiles file when decoding

Browse Source
This commit is contained in:
Eric Fischer 2019-10-31 13:50:29 -07:00
parent ec00ac2516
commit 25bf3957d1
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,3 +1,7 @@
## 1.34.6
* Fix crash when there are null entries in the metadata table
## 1.34.5 ## 1.34.5
* Fix line numbers in GeoJSON feature parsing error messages * Fix line numbers in GeoJSON feature parsing error messages

20
decode.cpp
View File

@ -306,17 +306,17 @@ void decode(char *fname, int z, unsigned x, unsigned y, std::set<std::string> co
const unsigned char *name = sqlite3_column_text(stmt2, 0); const unsigned char *name = sqlite3_column_text(stmt2, 0);
const unsigned char *value = sqlite3_column_text(stmt2, 1); const unsigned char *value = sqlite3_column_text(stmt2, 1);
if (name == NULL || value == NULL) {
fprintf(stderr, "Corrupt mbtiles file: null metadata\n");
exit(EXIT_FAILURE);
}
if (exclude_meta.count((char *) name) == 0) { if (exclude_meta.count((char *) name) == 0) {
if (within) { if (within) {
state.json_comma_newline(); state.json_comma_newline();
} }
within = 1; within = 1;
if (name == NULL || value == NULL) {
fprintf(stderr, "Corrupt mbtiles file: null metadata\n");
exit(EXIT_FAILURE);
}
state.json_write_string((char *) name); state.json_write_string((char *) name);
state.json_write_string((char *) value); state.json_write_string((char *) value);
} }
@ -413,6 +413,11 @@ void decode(char *fname, int z, unsigned x, unsigned y, std::set<std::string> co
ty = (1LL << tz) - 1 - ty; ty = (1LL << tz) - 1 - ty;
const char *s = (const char *) sqlite3_column_blob(stmt, 0); const char *s = (const char *) sqlite3_column_blob(stmt, 0);
if (s == NULL) {
fprintf(stderr, "Corrupt mbtiles file: null entry in tiles table\n");
exit(EXIT_FAILURE);
}
handle(std::string(s, len), tz, tx, ty, to_decode, pipeline, stats, state); handle(std::string(s, len), tz, tx, ty, to_decode, pipeline, stats, state);
} }
@ -449,6 +454,11 @@ void decode(char *fname, int z, unsigned x, unsigned y, std::set<std::string> co
int len = sqlite3_column_bytes(stmt, 0); int len = sqlite3_column_bytes(stmt, 0);
const char *s = (const char *) sqlite3_column_blob(stmt, 0); const char *s = (const char *) sqlite3_column_blob(stmt, 0);
if (s == NULL) {
fprintf(stderr, "Corrupt mbtiles file: null entry in tiles table\n");
exit(EXIT_FAILURE);
}
if (z != oz) { if (z != oz) {
fprintf(stderr, "%s: Warning: using tile %d/%u/%u instead of %d/%u/%u\n", fname, z, x, y, oz, ox, oy); fprintf(stderr, "%s: Warning: using tile %d/%u/%u instead of %d/%u/%u\n", fname, z, x, y, oz, ox, oy);
} }

2
version.hpp
View File

@ -1,6 +1,6 @@
#ifndef VERSION_HPP #ifndef VERSION_HPP
#define VERSION_HPP #define VERSION_HPP
#define VERSION "v1.34.5" #define VERSION "v1.34.6"
#endif #endif