From 9b3ac17991b3b421591111f863f0583ef2f06a01 Mon Sep 17 00:00:00 2001 From: Anuj Phogat Date: Wed, 11 Jan 2012 15:26:10 -0800 Subject: [PATCH] intel: Fix segfault in glXSwapBuffers with no bound context Calling glXSwapBuffers with no bound context causes segmentation fault in function intelDRI2Flush. All the gl calls should be ignored after setting the current context to null. So the contents of framebuffer stay unchanged. But the driver should not seg fault. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=44614 Reported-by: Yi Sun Signed-off-by: Anuj Phogat Reviewed-by: Kenneth Graunke Tested-by: Yi Sun (cherry picked from commit dd7220652e65a8a23e7739eeee687f3d6a865b80) Conflicts: src/mesa/drivers/dri/intel/intel_screen.c --- src/mesa/drivers/dri/intel/intel_screen.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c index 5ca9b669fec..96d448c38ec 100644 --- a/src/mesa/drivers/dri/intel/intel_screen.c +++ b/src/mesa/drivers/dri/intel/intel_screen.c @@ -108,13 +108,15 @@ intelDRI2Flush(__DRIdrawable *drawable) GET_CURRENT_CONTEXT(ctx); struct intel_context *intel = intel_context(ctx); - if (intel->gen < 4) - INTEL_FIREVERTICES(intel); + if (intel != NULL) { + if (intel->gen < 4) + INTEL_FIREVERTICES(intel); - intel->need_throttle = GL_TRUE; + intel->need_throttle = GL_TRUE; - if (intel->batch.used) - intel_batchbuffer_flush(intel); + if (intel->batch.used) + intel_batchbuffer_flush(intel); + } } static const struct __DRI2flushExtensionRec intelFlushExtension = {