From b86f75e0faf7d646d5414cb6a6893bbb07131315 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 2 Nov 2015 23:31:02 +0300 Subject: Add some missing checks in renderers. --- src/render/mobileopenglgraphics.cpp | 2 ++ src/render/modernopenglgraphics.cpp | 2 ++ src/render/sdl2graphics.cpp | 2 ++ src/render/sdl2softwaregraphics.cpp | 2 ++ src/render/sdlgraphics.cpp | 2 ++ 5 files changed, 10 insertions(+) (limited to 'src') diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp index b385d8306..0ee37ddfe 100644 --- a/src/render/mobileopenglgraphics.cpp +++ b/src/render/mobileopenglgraphics.cpp @@ -845,6 +845,8 @@ void MobileOpenGLGraphics::calcWindow(ImageCollection *const vertCol, return; ImageVertexes *vert = nullptr; const Image *const image = imgRect.grid[4]; + if (!image) + return; if (vertCol->currentGLImage != image->mGLImage) { vert = new ImageVertexes(); diff --git a/src/render/modernopenglgraphics.cpp b/src/render/modernopenglgraphics.cpp index 9f3bd9809..e544254b4 100644 --- a/src/render/modernopenglgraphics.cpp +++ b/src/render/modernopenglgraphics.cpp @@ -797,6 +797,8 @@ void ModernOpenGLGraphics::calcWindow(ImageCollection *const vertCol, return; ImageVertexes *vert = nullptr; const Image *const image = imgRect.grid[4]; + if (!image) + return; if (vertCol->currentGLImage != image->mGLImage) { vert = new ImageVertexes(); diff --git a/src/render/sdl2graphics.cpp b/src/render/sdl2graphics.cpp index 3b631caa5..7bad93889 100644 --- a/src/render/sdl2graphics.cpp +++ b/src/render/sdl2graphics.cpp @@ -635,6 +635,8 @@ void SDLGraphics::calcWindow(ImageCollection *const vertCol, { ImageVertexes *vert = nullptr; Image *const image = imgRect.grid[4]; + if (!image) + return; if (vertCol->currentImage != image) { vert = new ImageVertexes(); diff --git a/src/render/sdl2softwaregraphics.cpp b/src/render/sdl2softwaregraphics.cpp index f7e5b9ee1..3afadd27c 100644 --- a/src/render/sdl2softwaregraphics.cpp +++ b/src/render/sdl2softwaregraphics.cpp @@ -819,6 +819,8 @@ void SDL2SoftwareGraphics::calcWindow(ImageCollection *const vertCol, { ImageVertexes *vert = nullptr; Image *const image = imgRect.grid[4]; + if (!image) + return; if (vertCol->currentImage != image) { vert = new ImageVertexes(); diff --git a/src/render/sdlgraphics.cpp b/src/render/sdlgraphics.cpp index db2d15ae4..771d000d8 100644 --- a/src/render/sdlgraphics.cpp +++ b/src/render/sdlgraphics.cpp @@ -821,6 +821,8 @@ void SDLGraphics::calcWindow(ImageCollection *const vertCol, ImageVertexes *vert = nullptr; Image *const image = imgRect.grid[4]; + if (!image) + return; if (vertCol->currentImage != image) { vert = new ImageVertexes(); -- cgit v1.2.3-60-g2f50