summaryrefslogtreecommitdiff
path: root/src/mbgl/renderer/layers/render_raster_layer.cpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2018-07-23 16:08:44 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2018-07-23 16:08:58 -0700
commit18fc0b76536ad9191cc5c4699097617de51555c9 (patch)
tree59f44eca5fb7f8e2c830e6f10d0ee8e7bc158c50 /src/mbgl/renderer/layers/render_raster_layer.cpp
parentbcc93baeb152bf3f0b5540cfd08e989bc1b032a7 (diff)
downloadqtlocation-mapboxgl-upstream/fix-12432.tar.gz
[core] Check all bucket dynamic_castsupstream/fix-12432
A mismatch can occur when a layer changes from one type to another.
Diffstat (limited to 'src/mbgl/renderer/layers/render_raster_layer.cpp')
-rw-r--r--src/mbgl/renderer/layers/render_raster_layer.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mbgl/renderer/layers/render_raster_layer.cpp b/src/mbgl/renderer/layers/render_raster_layer.cpp
index f31f53481f..13f2f5e38c 100644
--- a/src/mbgl/renderer/layers/render_raster_layer.cpp
+++ b/src/mbgl/renderer/layers/render_raster_layer.cpp
@@ -142,8 +142,11 @@ void RenderRasterLayer::render(PaintParameters& parameters, RenderSource* source
}
} else {
for (const RenderTile& tile : renderTiles) {
- assert(dynamic_cast<RasterBucket*>(tile.tile.getBucket(*baseImpl)));
- RasterBucket& bucket = *reinterpret_cast<RasterBucket*>(tile.tile.getBucket(*baseImpl));
+ auto bucket_ = dynamic_cast<RasterBucket*>(tile.tile.getBucket(*baseImpl));
+ if (!bucket_) {
+ continue;
+ }
+ RasterBucket& bucket = *bucket_;
if (!bucket.hasData())
continue;