ExternalVendorCode/tippecanoe
1
0
Fork 0
mirror of https://github.com/mapbox/tippecanoe.git synced 2025-02-24 10:44:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix array bounds reference in tile-join property iteration

Browse Source
This commit is contained in:
Eric Fischer 2018-08-15 15:08:11 -07:00
parent adc403906d
commit a35c22ea94
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tile-join.cpp
View File

@ -210,14 +210,19 @@ void handle(std::string message, int z, unsigned x, unsigned y, std::map<std::st
std::vector<std::pair<std::string, mvt_value>> todo;
for (size_t t = 0; t + 1 < feat.tags.size(); t += 2) {
const char *key = layer.keys[feat.tags[t]].c_str();
std::string key = layer.keys[feat.tags[t]];
mvt_value &val = layer.values[feat.tags[t + 1]];
todo.push_back(std::pair<std::string, mvt_value>(key, val));
}
for (size_t t = 0; t + 1 < feat.properties.size(); t += 2) {
const char *key = layer.keys[feat.properties[t]].c_str();
for (size_t t = 0; t + 1 < feat.properties.size(); t++) {
if (feat.properties[t] > layer.keys.size()) {
fprintf(stderr, "Internal error: out of bounds property key\n");
exit(EXIT_FAILURE);
}
std::string key = layer.keys[feat.properties[t]];
t++;
mvt_value val = layer.decode_property(feat.properties, t);