From 2bec49d38faf37bd4b7fcc43d6d409c0d6934e2d Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Fri, 27 Sep 2019 16:06:37 -0700 Subject: [PATCH] virgl/egl: fix null pointer dereference 2 Another null pointer dereference. Fixes https://gitlab.freedesktop.org/virgl/virglrenderer/issues/67. Reviewed-by Gert Wollny --- src/virgl_egl_context.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/virgl_egl_context.c b/src/virgl_egl_context.c index c50c9b6..2d81c09 100644 --- a/src/virgl_egl_context.c +++ b/src/virgl_egl_context.c @@ -118,7 +118,7 @@ struct virgl_egl *virgl_egl_init(struct virgl_gbm *gbm, bool surfaceless, bool g egl->gbm = gbm; const char *client_extensions = eglQueryString (NULL, EGL_EXTENSIONS); - if (strstr (client_extensions, "EGL_KHR_platform_base")) { + if (client_extensions && strstr(client_extensions, "EGL_KHR_platform_base")) { PFNEGLGETPLATFORMDISPLAYEXTPROC get_platform_display = (PFNEGLGETPLATFORMDISPLAYEXTPROC) eglGetProcAddress ("eglGetPlatformDisplay"); @@ -131,7 +131,7 @@ struct virgl_egl *virgl_egl_init(struct virgl_gbm *gbm, bool surfaceless, bool g } else egl->egl_display = get_platform_display (EGL_PLATFORM_GBM_KHR, (EGLNativeDisplayType)egl->gbm->device, NULL); - } else if (strstr (client_extensions, "EGL_EXT_platform_base")) { + } else if (client_extensions && strstr(client_extensions, "EGL_EXT_platform_base")) { PFNEGLGETPLATFORMDISPLAYEXTPROC get_platform_display = (PFNEGLGETPLATFORMDISPLAYEXTPROC) eglGetProcAddress ("eglGetPlatformDisplayEXT");