summaryrefslogtreecommitdiff
path: root/src/plugins/geoservices/osm
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-02-02 11:31:19 +0100
committerLiang Qi <liang.qi@qt.io>2017-02-02 11:31:38 +0100
commit77649273d79721a1abb4eabb0d6cedc7e4f17a5a (patch)
tree70ac3b1c85f557549305bdd16967ae8b05dbe8aa /src/plugins/geoservices/osm
parent87d7387c51f564f44602a8d2841d49df2d789e41 (diff)
parentee5bf40562aeca6fd861121ab29506cf905189f3 (diff)
downloadqtlocation-77649273d79721a1abb4eabb0d6cedc7e4f17a5a.tar.gz
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I07a2f4160750b548dfee882cb9b5b057d83236e2
Diffstat (limited to 'src/plugins/geoservices/osm')
-rw-r--r--src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp b/src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp
index 31d5ebc8..a36f15b3 100644
--- a/src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp
+++ b/src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp
@@ -318,6 +318,9 @@ QGeoTileSpec QGeoFileTileCacheOsm::filenameToTileSpec(const QString &filename) c
numbers.append(value);
}
+ if (numbers.at(0) > m_providers.size())
+ return emptySpec;
+
bool highDpi = m_providers[numbers.at(0) - 1]->isHighDpi();
if (highDpi && fields.at(1) != QLatin1Char('h'))
return emptySpec;