debian/changelog | 4 ++++ debian/patches/232-xf86compatoutput-valgrind.patch | 13 +++++++++++++ debian/patches/series | 1 + 3 files changed, 18 insertions(+)
New commits: commit a94d3727a4be2bc2108e78b0df68900585f974dc Author: Maarten Lankhorst <[email protected]> Date: Mon Oct 8 11:28:11 2012 +0200 add 232-xf86compatoutput-valgrind.patch to silence a valgrind error diff --git a/debian/changelog b/debian/changelog index db9b730..0c356d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ xorg-server (2:1.13.0-0ubuntu6) UNRELEASED; urgency=low + [ Timo Aaltonen ] * patches/series: Reorganize our patches in categories in order to make reviewing and rebasing easier. + [ Maarten Lankhorst ] + * add 232-xf86compatoutput-valgrind.patch to silence a valgrind error + -- Timo Aaltonen <[email protected]> Mon, 01 Oct 2012 09:29:29 +0300 xorg-server (2:1.13.0-0ubuntu5) quantal; urgency=low diff --git a/debian/patches/232-xf86compatoutput-valgrind.patch b/debian/patches/232-xf86compatoutput-valgrind.patch new file mode 100644 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]; + } diff --git a/debian/patches/series b/debian/patches/series index 69a7c91..b81784e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -22,6 +22,7 @@ 167_nullptr_xisbread.patch 208_switch_on_release.diff 227_null_ptr_midispcur.patch +232-xf86compatoutput-valgrind.patch ## waiting for review by upstream 111_armel-drv-fallbacks.patch -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
