Imported Debian patch 2:1.15.1-0ubuntu2.6

[deb_xorg-server.git] / debian / patches / 232-xf86compatoutput-valgrind.patch

diff --git a/debian/patches/232-xf86compatoutput-valgrind.patch b/debian/patches/232-xf86compatoutput-valgrind.patch
new file mode 100644 (file)
index 0000000..8d59186
--- /dev/null
+++ b/debian/patches/232-xf86compatoutput-valgrind.patch
@@ -0,0 +1,13 @@
+diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h
+index 802303f..6e80210 100644
+--- a/hw/xfree86/modes/xf86Crtc.h
++++ b/hw/xfree86/modes/xf86Crtc.h
+@@ -730,6 +730,8 @@ static _X_INLINE xf86OutputPtr
+ xf86CompatOutput(ScrnInfoPtr pScrn)
+ {
+     xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
++    if (config->compat_output < 0)
++        return NULL;
+ 
+     return config->output[config->compat_output];
+ }