From af86a79f6ac5c11d1986be8a3d549fef03482789 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 25 Jun 2015 23:10:21 +0300
Subject: Add missing checks into render directory.

---
 src/render/sdlgraphics.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'src/render/sdlgraphics.cpp')

diff --git a/src/render/sdlgraphics.cpp b/src/render/sdlgraphics.cpp
index a82f85621..db2d15ae4 100644
--- a/src/render/sdlgraphics.cpp
+++ b/src/render/sdlgraphics.cpp
@@ -646,6 +646,9 @@ void SDLGraphics::calcPattern(ImageCollection* const vertCol,
                               const int x, const int y,
                               const int w, const int h) const
 {
+    if (!vertCol || !image)
+        return;
+
     ImageVertexes *vert = nullptr;
     if (vertCol->currentImage != image)
     {
@@ -667,6 +670,8 @@ void SDLGraphics::calcTileVertexes(ImageVertexes *const vert,
                                    const Image *const image,
                                    int x, int y) const
 {
+    if (!vert || !image)
+        return;
     vert->image = image;
     calcTileSDL(vert, x, y);
 }
@@ -675,6 +680,8 @@ void SDLGraphics::calcTileVertexesInline(ImageVertexes *const vert,
                                          const Image *const image,
                                          int x, int y) const
 {
+    if (!vert || !image)
+        return;
     vert->image = image;
     calcTileSDL(vert, x, y);
 }
@@ -711,6 +718,8 @@ void SDLGraphics::calcTileCollection(ImageCollection *const vertCol,
                                      const Image *const image,
                                      int x, int y)
 {
+    if (!vertCol)
+        return;
     if (vertCol->currentImage != image)
     {
         ImageVertexes *const vert = new ImageVertexes();
@@ -729,6 +738,8 @@ void SDLGraphics::calcTileCollection(ImageCollection *const vertCol,
 void SDLGraphics::drawTileCollection(const ImageCollection
                                      *const vertCol)
 {
+    if (!vertCol)
+        return;
     const ImageVertexesVector &draws = vertCol->draws;
     const ImageCollectionCIter it_end = draws.end();
     for (ImageCollectionCIter it = draws.begin(); it != it_end; ++ it)
@@ -749,6 +760,8 @@ void SDLGraphics::drawTileCollection(const ImageCollection
 
 void SDLGraphics::drawTileVertexes(const ImageVertexes *const vert)
 {
+    if (!vert)
+        return;
     // vert and img must be != 0
     const Image *const img = vert->image;
     const DoubleRects *const rects = &vert->sdl;
@@ -803,6 +816,9 @@ void SDLGraphics::calcWindow(ImageCollection *const vertCol,
                              const int w, const int h,
                              const ImageRect &imgRect)
 {
+    if (!vertCol)
+        return;
+
     ImageVertexes *vert = nullptr;
     Image *const image = imgRect.grid[4];
     if (vertCol->currentImage != image)
-- 
cgit v1.2.3-60-g2f50