From 543bbe6a39d982a3e0abe2fec92ed14e50516e03 Mon Sep 17 00:00:00 2001 From: Yuxuan Shui Date: Thu, 31 Jan 2019 22:40:17 +0000 Subject: [PATCH] Fix NULL pointer dereference in glx_init_blur Signed-off-by: Yuxuan Shui --- src/opengl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/opengl.c b/src/opengl.c index 28052f4f..df24be3b 100644 --- a/src/opengl.c +++ b/src/opengl.c @@ -563,12 +563,16 @@ glx_init_blur(session_t *ps) { "texture2DRect": "texture2D"); const char *shader_add = FRAG_SHADER_BLUR_ADD; char *extension = NULL; - if (use_texture_rect) + if (use_texture_rect) { mstrextend(&extension, "#extension GL_ARB_texture_rectangle : require\n"); + } if (ps->o.glx_use_gpushader4) { mstrextend(&extension, "#extension GL_EXT_gpu_shader4 : require\n"); shader_add = FRAG_SHADER_BLUR_ADD_GPUSHADER4; } + if (!extension) { + extension = strdup(""); + } for (int i = 0; i < MAX_BLUR_PASS && ps->o.blur_kerns[i]; ++i) { xcb_render_fixed_t *kern = ps->o.blur_kerns[i];