xserver-xorg-video-intel: Changes to 'debian-unstable'
debian/changelog | 8 ++
debian/patches/0003-Avoid-calling-xf86nameCompare-with-a-NULL-pointer.patch | 32 ++++++++++
debian/patches/series | 1
3 files changed, 41 insertions(+)
New commits:
commit 79ad994a10f3342cf2d33e44c4cc9b2c8cd7d0d3
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Jun 12 20:30:56 2012 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 3d41440..5bc9fe1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-video-intel (2:2.19.0-3) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.19.0-3) unstable; urgency=low
* Add patch to avoid X segfaults with Driver-less Device sections in
xorg.conf (Closes: #677206):
- 0003-Avoid-calling-xf86nameCompare-with-a-NULL-pointer.patch
- -- Cyril Brulebois <kibi@debian.org> Tue, 12 Jun 2012 20:27:54 +0200
+ -- Cyril Brulebois <kibi@debian.org> Tue, 12 Jun 2012 20:30:51 +0200
xserver-xorg-video-intel (2:2.19.0-2) unstable; urgency=low
commit 621e048094f2b76ce70c7a1999147644d2437005
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Jun 12 20:30:40 2012 +0200
Avoid X segfaults with Driver-less Device sections in xorg.conf (Closes: #677206).
diff --git a/debian/changelog b/debian/changelog
index 3b45678..3d41440 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.19.0-3) UNRELEASED; urgency=low
+
+ * Add patch to avoid X segfaults with Driver-less Device sections in
+ xorg.conf (Closes: #677206):
+ - 0003-Avoid-calling-xf86nameCompare-with-a-NULL-pointer.patch
+
+ -- Cyril Brulebois <kibi@debian.org> Tue, 12 Jun 2012 20:27:54 +0200
+
xserver-xorg-video-intel (2:2.19.0-2) unstable; urgency=low
* Cherry-pick the following commits to make it possible to build both
diff --git a/debian/patches/0003-Avoid-calling-xf86nameCompare-with-a-NULL-pointer.patch b/debian/patches/0003-Avoid-calling-xf86nameCompare-with-a-NULL-pointer.patch
new file mode 100644
index 0000000..1b9ca47
--- /dev/null
+++ b/debian/patches/0003-Avoid-calling-xf86nameCompare-with-a-NULL-pointer.patch
@@ -0,0 +1,32 @@
+From 0de44dd7d7cbd5307afce2245ffbdc748e868223 Mon Sep 17 00:00:00 2001
+From: Cyril Brulebois <kibi@debian.org>
+Date: Tue, 12 Jun 2012 20:00:10 +0200
+Subject: [PATCH] Avoid calling xf86nameCompare() with a NULL pointer.
+
+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 <kibi@debian.org>
+---
+ src/intel_module.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/intel_module.c b/src/intel_module.c
+index 4430ac6..fa78b59 100644
+--- a/src/intel_module.c
++++ b/src/intel_module.c
+@@ -299,7 +299,7 @@ static XF86ConfDevicePtr
+ _xf86findDriver(const char *ident, XF86ConfDevicePtr p)
+ {
+ 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.10
+
diff --git a/debian/patches/series b/debian/patches/series
index 340efc7..3a9b06b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
0001-Fix-build-failure-when-passing-with-builderstring.patch
0002-Update-manpage-for-new-accelmethod-option.patch
+0003-Avoid-calling-xf86nameCompare-with-a-NULL-pointer.patch
Reply to: