xorg-server: Changes to 'ubuntu'

[Maarten Lankhorst <mlankhorst-guest@alioth.debian.org>]

 debian/changelog                         |    6 ++++++
 debian/patches/xf86-detach-scanout.patch |    2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit cde1b97c0e08b168eb89a50f64acb843a12737d7
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date:   Thu Jul 11 16:55:09 2013 +0200

    Fix null pointer deref on logout. (LP: #1194343)

diff --git a/debian/changelog b/debian/changelog
index ea0fd0d..cfb9eb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.14.1-0ubuntu1) saucy; urgency=low
+
+  * Fix null pointer deref on logout. (LP: #1194343)
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Thu, 11 Jul 2013 16:52:28 +0200
+
 xorg-server (2:1.14.1-0ubuntu0.8) saucy; urgency=low
 
   * Use correct version for libxfixes3.
diff --git a/debian/patches/xf86-detach-scanout.patch b/debian/patches/xf86-detach-scanout.patch
index e25bd48..9226590 100644
--- a/debian/patches/xf86-detach-scanout.patch
+++ b/debian/patches/xf86-detach-scanout.patch
@@ -37,7 +37,7 @@ Dave, does this seem like a reasonable way to work around this particular crash?
 +    int i;
 +
 +    /* make sure there are no attached shared scanout pixmaps first */
-+    for (i = 0; i < rp->numCrtcs; i++)
++    for (i = 0; i < rp && rp->numCrtcs; i++)
 +        RRCrtcDetachScanoutPixmap(rp->crtcs[i]);
 +
 +    DetachOutputGPU(pScreen);