From mboxrd@z Thu Jan 1 00:00:00 1970 From: Cyril Brulebois Subject: [PATCH] Avoid calling xf86nameCompare() with a NULL pointer. Date: Tue, 12 Jun 2012 20:15:19 +0200 Message-ID: <1339524919-22493-1-git-send-email-kibi@debian.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from glenfiddich.mraw.org (glenfiddich.mraw.org [88.191.124.82]) by gabe.freedesktop.org (Postfix) with ESMTP id D5D5D9E732 for ; Tue, 12 Jun 2012 11:33:18 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org Cc: Cyril Brulebois List-Id: intel-gfx@lists.freedesktop.org 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 Signed-off-by: Cyril Brulebois --- 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