commit 94bfee39d75b0c151fa8bd194be7869ca5790c0b
Author: Bryce Harrington <bryce@canonical.com>
Date:   Wed May 4 17:57:50 2011 -0700

    Add patch to check for null privates pointer before deref

diff --git a/debian/changelog b/debian/changelog
index 0e1fc66..58f0608 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xserver-xorg-video-intel (2:2.14.0-4ubuntu7.2) natty; urgency=low
+
+  * Add 120_check_privates.patch:  Check for null privates pointer
+    on render_dest_picture.  Prevents segmentation fault with Tk
+    strings in widgets beyond a certain length.
+    (LP: #731424)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Wed, 04 May 2011 17:24:35 -0700
+
 xserver-xorg-video-intel (2:2.14.0-4ubuntu7.1) natty-proposed; urgency=low
 
   * Add 119_disable_relaxed_fencing.patch: The relaxed fencing
diff --git a/debian/patches/120_check_privates.patch b/debian/patches/120_check_privates.patch
new file mode 100644
index 0000000..58d0c66
--- /dev/null
+++ b/debian/patches/120_check_privates.patch
@@ -0,0 +1,22 @@
+diff --git a/src/i965_render.c b/src/i965_render.c
+index b1ac6ba..7831caf 100644
+--- a/src/i965_render.c
++++ b/src/i965_render.c
+@@ -1761,6 +1761,7 @@ i965_composite(PixmapPtr dest, int srcX, int srcY, int maskX, int maskY,
+ {
+ 	ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
+ 	intel_screen_private *intel = intel_get_screen_private(scrn);
++	PicturePtr dest_picture = intel->render_dest_picture;
+ 	struct gen4_render_state *render_state = intel->gen4_render_state;
+ 	Bool has_mask;
+ 	float src_x[3], src_y[3], src_w[3], mask_x[3], mask_y[3], mask_w[3];
+@@ -1842,6 +1843,9 @@ i965_composite(PixmapPtr dest, int srcX, int srcY, int maskX, int maskY,
+ 
+ 	intel_batch_start_atomic(scrn, 200);
+ 	if (intel->needs_render_state_emit) {
++		if (!dest_picture->devPrivates)
++			return;
++
+ 		i965_bind_surfaces(intel);
+ 
+ 		if (INTEL_INFO(intel)->gen >= 60)
diff --git a/debian/patches/series b/debian/patches/series
index 857a420..ae6c5e3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@
 115_quell_vblank_counter_failed.patch
 117_946gz_isreally_965g.patch
 119_disable_relaxed_fencing.path
+120_check_privates.patch