From 426b5d3149f5fe510322a26cc8e67ba6de08d4a6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lo=C3=AFc=20Blot?= Date: Mon, 7 Jan 2019 17:05:18 +0100 Subject: [PATCH] Fix a crash on Android with Align2Npot2 (#8070) * Fix a crash on Android with Align2Npot2 glGetString can be NULL. If stored in a string it triggers a SIGSEGV. Instead do a basic strstr and verify the pointer * Better Align2Npot2 check (+ performance) --- src/client/tile.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/client/tile.cpp b/src/client/tile.cpp index cfdff1bb2..ba6b3dfff 100644 --- a/src/client/tile.cpp +++ b/src/client/tile.cpp @@ -1138,13 +1138,14 @@ video::IImage * Align2Npot2(video::IImage * image, core::dimension2d dim = image->getDimension(); - std::string extensions = (char*) glGetString(GL_EXTENSIONS); - // Only GLES2 is trusted to correctly report npot support - if (get_GL_major_version() > 1 && - extensions.find("GL_OES_texture_npot") != std::string::npos) { + // Note: we cache the boolean result. GL context will never change on Android. + static const bool hasNPotSupport = get_GL_major_version() > 1 && + glGetString(GL_EXTENSIONS) && + strstr(glGetString(GL_EXTENSIONS), "GL_OES_texture_npot"); + + if (hasNPotSupport) return image; - } unsigned int height = npot2(dim.Height); unsigned int width = npot2(dim.Width); -- 2.25.1