From a3b786a1ae7533129dfd359e2a096ad9405f03d5 Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Wed, 4 May 2011 20:03:59 -0700 Subject: [PATCH] Check render_dest_picture->devPrivates for null before deref Tk client apps using DejaVu Sans fonts on long strings can generate a fault in the X server due to an undefined member in the intel_screen_private structure. Ubuntu Bug 731424 X.org Bug 36860 Signed-off-by: Bryce Harrington --- src/i965_render.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/i965_render.c b/src/i965_render.c index bfcd3f2..cb366c2 100644 --- a/src/i965_render.c +++ b/src/i965_render.c @@ -1079,6 +1079,9 @@ i965_set_picture_surface_state(intel_screen_private *intel, uint32_t write_domain, read_domains; int offset; + if (!priv) + return; + if (is_dst) { write_domain = I915_GEM_DOMAIN_RENDER; read_domains = I915_GEM_DOMAIN_RENDER; -- 1.7.4.1