Merge pull request #15108 from xbmc/fix-gl-extensions

 Do not crash when not getting GL_EXTENSIONS

1 files changed, 7 insertions, 3 deletions

diff --git a/xbmc/rendering/gl/RenderSystemGL.cpp b/xbmc/rendering/gl/RenderSystemGL.cpp
index de26031bca..94846c4a62 100644
--- a/xbmc/rendering/gl/RenderSystemGL.cpp
+++ b/xbmc/rendering/gl/RenderSystemGL.cpp
@@ -48,21 +48,25 @@ bool CRenderSystemGL::InitRenderSystem()
   if (m_RenderVersionMajor > 3 ||
       (m_RenderVersionMajor == 3 && m_RenderVersionMinor >= 2))
   {
-    GLint n;
+    GLint n = 0;
     glGetIntegerv(GL_NUM_EXTENSIONS, &n);
     if (n > 0)
     {
       GLint i;
       for (i = 0; i < n; i++)
       {
-        m_RenderExtensions += (const char*)glGetStringi(GL_EXTENSIONS, i);
+        m_RenderExtensions += (const char*) glGetStringi(GL_EXTENSIONS, i);
         m_RenderExtensions += " ";
       }
     }
   }
   else
   {
-    m_RenderExtensions += (const char*) glGetString(GL_EXTENSIONS);
+    auto extensions = (const char*) glGetString(GL_EXTENSIONS);
+    if (extensions)
+    {
+      m_RenderExtensions += extensions;
+    }
   }
   m_RenderExtensions += " ";