Tile: Fix segfault caused by invalid PNG data

[minetest.git] / src / client / tile.cpp

diff --git a/src/client/tile.cpp b/src/client/tile.cpp
index a29a6611afb3514effbaaa36f9504aa66457b95c..14fc316e7e69fa8e1213f1816640252a5b5b1b87 100644 (file)
--- a/src/client/tile.cpp
+++ b/src/client/tile.cpp
@@ -1869,6 +1869,11 @@ bool TextureSource::generateImagePart(std::string part_of_name,
                        video::IImage* pngimg = vd->createImageFromFile(memfile);
                        memfile->drop();
 
+                       if (!pngimg) {
+                               errorstream << "generateImagePart(): Invalid PNG data" << std::endl;
+                               return false;
+                       }
+
                        if (baseimg) {
                                blitBaseImage(pngimg, baseimg);
                        } else {