From b8cb829e463e228c45e7c2fb0aa8edd7f79d70a1 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Wed, 30 Sep 2015 15:17:38 +1000 Subject: [PATCH] glcontext: fixup strstr lengths so we don't overrun --- gst-libs/gst/gl/gstglcontext.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gst-libs/gst/gl/gstglcontext.c b/gst-libs/gst/gl/gstglcontext.c index d177df8b77..14f27928c1 100644 --- a/gst-libs/gst/gl/gstglcontext.c +++ b/gst-libs/gst/gl/gstglcontext.c @@ -310,7 +310,7 @@ gst_gl_context_new (GstGLDisplay * display) GST_INFO ("creating a context for display %" GST_PTR_FORMAT ", user choice:%s", display, user_choice); #if GST_GL_HAVE_PLATFORM_CGL - if (!context && (!user_choice || g_strstr_len (user_choice, 5, "cgl"))) + if (!context && (!user_choice || g_strstr_len (user_choice, 3, "cgl"))) context = GST_GL_CONTEXT (gst_gl_context_cocoa_new (display)); #endif #if GST_GL_HAVE_PLATFORM_GLX @@ -318,16 +318,15 @@ gst_gl_context_new (GstGLDisplay * display) context = GST_GL_CONTEXT (gst_gl_context_glx_new (display)); #endif #if GST_GL_HAVE_PLATFORM_EGL - if (!context && (!user_choice || g_strstr_len (user_choice, 7, "egl"))) + if (!context && (!user_choice || g_strstr_len (user_choice, 3, "egl"))) context = GST_GL_CONTEXT (gst_gl_context_egl_new (display)); #endif #if GST_GL_HAVE_PLATFORM_WGL - if (!context && (!user_choice || g_strstr_len (user_choice, 3, "wgl"))) { + if (!context && (!user_choice || g_strstr_len (user_choice, 3, "wgl"))) context = GST_GL_CONTEXT (gst_gl_context_wgl_new (display)); - } #endif #if GST_GL_HAVE_PLATFORM_EAGL - if (!context && (!user_choice || g_strstr_len (user_choice, 5, "eagl"))) + if (!context && (!user_choice || g_strstr_len (user_choice, 4, "eagl"))) context = GST_GL_CONTEXT (gst_gl_context_eagl_new (display)); #endif -- 2.34.1