Hello community, here is the log from the commit of package xf86-video-intel for openSUSE:Factory checked in at 2012-07-02 21:34:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-intel (Old) and /work/SRC/openSUSE:Factory/.xf86-video-intel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-intel", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-intel/xf86-video-intel.changes 2012-06-12 22:10:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-video-intel.new/xf86-video-intel.changes 2012-07-02 21:34:55.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Jul 2 10:11:53 UTC 2012 - [email protected] + +- U_Avoid-calling-xf86nameCompare-with-a-NULL-string.patch/ + U_Fix-up-braindamage-in-previous-commit.patch + * fixes Sig11 with missing driver name in xorg.conf (bnc#766059, + fdo#51640) + +------------------------------------------------------------------- New: ---- U_Avoid-calling-xf86nameCompare-with-a-NULL-string.patch U_Fix-up-braindamage-in-previous-commit.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-intel.spec ++++++ --- /var/tmp/diff_new_pack.zQuBK9/_old 2012-07-02 21:34:56.000000000 +0200 +++ /var/tmp/diff_new_pack.zQuBK9/_new 2012-07-02 21:34:56.000000000 +0200 @@ -29,6 +29,8 @@ Source99: baselibs.conf Patch0: xf86-video-intel-dell_backlight.diff Patch1: xf86-video-intel-copyfb.diff +Patch2: U_Avoid-calling-xf86nameCompare-with-a-NULL-string.patch +Patch3: U_Fix-up-braindamage-in-previous-commit.patch %if %glamor Requires: glamor %endif @@ -94,6 +96,8 @@ %patch0 -p1 ### disabled for now (bnc #687802) #%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build autoreconf -fi ++++++ U_Avoid-calling-xf86nameCompare-with-a-NULL-string.patch ++++++ >From 224d631a232d3536e0f1f2780bfbe1218ee7590f Mon Sep 17 00:00:00 2001 From: Cyril Brulebois <[email protected]> Date: Tue, 12 Jun 2012 21:14:53 +0100 Subject: [PATCH 1/2] Avoid calling xf86nameCompare() with a NULL string Device sections without a Driver property would lead to a server segfault because of a NULL pointer's being passed as the second argument of xf86nameCompare(). Debian bug #677206 <http://bugs.debian.org/677206> Signed-off-by: Cyril Brulebois <[email protected]> --- src/intel_module.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/intel_module.c b/src/intel_module.c index 4430ac6..d6b4eb9 100644 --- a/src/intel_module.c +++ b/src/intel_module.c @@ -298,12 +298,16 @@ extern XF86ConfigPtr xf86configptr; static XF86ConfDevicePtr _xf86findDriver(const char *ident, XF86ConfDevicePtr p) { + if (p->dev_driver == NULL) + return NULL; + while (p) { if (xf86nameCompare(ident, p->dev_driver) == 0) return p; p = p->list.next; } + return NULL; } -- 1.7.3.4 ++++++ U_Fix-up-braindamage-in-previous-commit.patch ++++++ >From 6138f7434a6fb014299a7e9a8392ef962c8cba30 Mon Sep 17 00:00:00 2001 From: Cyril Brulebois <[email protected]> Date: Tue, 12 Jun 2012 21:19:14 +0100 Subject: [PATCH 2/2] Fix up braindamage in previous commit. ickle: Fixing up my idiotic change, obviously too much birthday cake. --- src/intel_module.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/src/intel_module.c b/src/intel_module.c index d6b4eb9..af82cff 100644 --- a/src/intel_module.c +++ b/src/intel_module.c @@ -298,11 +298,8 @@ extern XF86ConfigPtr xf86configptr; static XF86ConfDevicePtr _xf86findDriver(const char *ident, XF86ConfDevicePtr p) { - if (p->dev_driver == NULL) - return NULL; - while (p) { - if (xf86nameCompare(ident, p->dev_driver) == 0) + if (p->dev_driver && xf86nameCompare(ident, p->dev_driver) == 0) return p; p = p->list.next; -- 1.7.3.4 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
