File U_Avoid-calling-xf86nameCompare-with-a-NULL-str... of Package xf86-video-intel

Overview Repositories Revisions Requests Users Attributes Meta

File U_Avoid-calling-xf86nameCompare-with-a-NULL-string.patch of Package xf86-video-intel (Revision 09875885a044d7796e158ef61fdf222d)

Currently displaying revision 09875885a044d7796e158ef61fdf222d , Show latest

From 224d631a232d3536e0f1f2780bfbe1218ee7590f Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <kibi@debian.org>
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 <kibi@debian.org>
---
 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

Places

File U_Avoid-calling-xf86nameCompare-with-a-NULL-string.patch of Package xf86-video-intel (Revision 09875885a044d7796e158ef61fdf222d)

Places