diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2018-07-23 16:08:44 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2018-07-24 11:08:40 -0700 |
commit | 2bbc79206073d260863c887a95ee4ba25bc45910 (patch) | |
tree | 4478ba0db1d873ed35e80b7e342100d85728ed18 /src/mbgl/text/cross_tile_symbol_index.cpp | |
parent | cb714d57c5c5ad181aaf5e1690221da8d965682b (diff) | |
download | qtlocation-mapboxgl-2bbc79206073d260863c887a95ee4ba25bc45910.tar.gz |
[core] Check all bucket dynamic_casts
A mismatch can occur when a layer changes from one type to another.
Diffstat (limited to 'src/mbgl/text/cross_tile_symbol_index.cpp')
-rw-r--r-- | src/mbgl/text/cross_tile_symbol_index.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mbgl/text/cross_tile_symbol_index.cpp b/src/mbgl/text/cross_tile_symbol_index.cpp index 8df26ca117..58dcda46f5 100644 --- a/src/mbgl/text/cross_tile_symbol_index.cpp +++ b/src/mbgl/text/cross_tile_symbol_index.cpp @@ -178,9 +178,12 @@ bool CrossTileSymbolIndex::addLayer(RenderSymbolLayer& symbolLayer, float lng) { continue; } - auto bucket = renderTile.tile.getBucket(*symbolLayer.baseImpl); - assert(dynamic_cast<SymbolBucket*>(bucket)); - SymbolBucket& symbolBucket = *reinterpret_cast<SymbolBucket*>(bucket); + auto bucket = dynamic_cast<SymbolBucket*>(renderTile.tile.getBucket(*symbolLayer.baseImpl)); + if (!bucket) { + continue; + } + SymbolBucket& symbolBucket = *bucket; + if (symbolBucket.bucketLeaderID != symbolLayer.getID()) { // Only add this layer if it's the "group leader" for the bucket continue; |