From dde62cee8e854407d753c95ef65b9f8768ee17c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 15 Oct 2012 13:38:15 +0200 Subject: [PATCH] eglglessink: Fix crashes if there are no EGL or GLES extensions --- ext/eglgles/gsteglglessink.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ext/eglgles/gsteglglessink.c b/ext/eglgles/gsteglglessink.c index 60666d548a..58bf81120a 100644 --- a/ext/eglgles/gsteglglessink.c +++ b/ext/eglgles/gsteglglessink.c @@ -1244,8 +1244,8 @@ gst_eglglessink_init_egl_exts (GstEglGlesSink * eglglessink) eglexts = eglQueryString (eglglessink->eglglesctx->display, EGL_EXTENSIONS); glexts = glGetString (GL_EXTENSIONS); - GST_DEBUG_OBJECT (eglglessink, "Available EGL extensions: %s\n", eglexts); - GST_DEBUG_OBJECT (eglglessink, "Available GLES extensions: %s\n", glexts); + GST_DEBUG_OBJECT (eglglessink, "Available EGL extensions: %s\n", GST_STR_NULL (eglexts)); + GST_DEBUG_OBJECT (eglglessink, "Available GLES extensions: %s\n", GST_STR_NULL ((const char *) glexts)); #ifdef EGL_FAST_RENDERING_POSSIBLE /* OK Fast rendering should be possible from the declared @@ -1254,11 +1254,11 @@ gst_eglglessink_init_egl_exts (GstEglGlesSink * eglglessink) /* Check for support from claimed EGL/GLES extensions */ - if (!strstr (eglexts, "EGL_KHR_image")) + if (!eglexts || !strstr (eglexts, "EGL_KHR_image")) goto KHR_IMAGE_NA; - if (!strstr (eglexts, "EGL_KHR_lock_surface")) + if (!eglexts || !strstr (eglexts, "EGL_KHR_lock_surface")) goto SURFACE_LOCK_NA; - if (!strstr ((char *) glexts, "GL_OES_EGL_image")) + if (!glexts || !strstr ((char *) glexts, "GL_OES_EGL_image")) goto TEXTURE_2DOES_NA; /* Check for actual extension proc addresses */